svn commit: r289299 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Wed Oct 14 07:50:08 2015
New Revision: 289299
URL: https://svnweb.freebsd.org/changeset/base/289299

Log:
  MFV r289298: 6286 ZFS internal error when set large block on bootfs
  
  Reviewed by: Paul Dagnelie <pcd at delphix.com>
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: Andriy Gapon <avg at FreeBSD.org>
  Approved by: Robert Mustacchi <rm at joyent.com>
  Author: Matthew Ahrens <mahrens at delphix.com>
  
  illumos/illumos-gate at 6de9bb5603e65b16816b7ab29e39bac820e2da2b

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Wed Oct 14 07:48:39 2015	(r289298)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Wed Oct 14 07:50:08 2015	(r289299)
@@ -27,7 +27,7 @@
  * Copyright 2014 Xin Li <delphij at FreeBSD.org>. 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.
  */
@@ -3921,7 +3921,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));
 			}
 
 			/*
@@ -3930,7 +3930,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);