Author: mav
Date: Fri Nov 13 09:20:46 2015
New Revision: 290751
URL: https://svnweb.freebsd.org/changeset/base/290751

Log:
  MFC r289299: 6286 ZFS internal error when set large block on bootfs
  
  Reviewed by: Paul Dagnelie <[email protected]>
  Reviewed by: George Wilson <[email protected]>
  Reviewed by: Andriy Gapon <[email protected]>
  Approved by: Robert Mustacchi <[email protected]>
  Author: Matthew Ahrens <[email protected]>
  
  illumos/illumos-gate@6de9bb5603e65b16816b7ab29e39bac820e2da2b

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c        
Fri Nov 13 09:18:33 2015        (r290750)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c        
Fri Nov 13 09:20:46 2015        (r290751)
@@ -27,7 +27,7 @@
  * Copyright 2014 Xin Li <[email protected]>. All rights reserved.
  * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2014, Joyent, Inc. All rights reserved.
- * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
@@ -3920,7 +3920,7 @@ zfs_check_settable(const char *dsname, n
                         */
                        if (zfs_is_bootfs(dsname) &&
                            intval > SPA_OLD_MAXBLOCKSIZE) {
-                               return (SET_ERROR(EDOM));
+                               return (SET_ERROR(ERANGE));
                        }
 
                        /*
@@ -3929,7 +3929,7 @@ zfs_check_settable(const char *dsname, n
                         */
                        if (intval > zfs_max_recordsize ||
                            intval > SPA_MAXBLOCKSIZE)
-                               return (SET_ERROR(EDOM));
+                               return (SET_ERROR(ERANGE));
 
                        if ((err = spa_open(dsname, &spa, FTAG)) != 0)
                                return (err);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to