diff options
| author | Brian Behlendorf <behlendorf1@llnl.gov> | 2016-05-05 23:19:12 +0000 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2016-05-05 23:19:12 +0000 |
| commit | 4b2a3e0c9d6bcdec1fd279e9bb3b7c4628cd7ba6 (patch) | |
| tree | 1da605453c13d9a5d1c2b369d8b0eaab8c01f345 /module/zfs/zfs_ioctl.c | |
| parent | f7c63cda908ac10ecf11e4c3314011eedfbd9e42 (diff) | |
| download | src-4b2a3e0c9d6bcdec1fd279e9bb3b7c4628cd7ba6.tar.gz src-4b2a3e0c9d6bcdec1fd279e9bb3b7c4628cd7ba6.zip | |
OpenZFS 6286 - ZFS internal error when set large block on bootfs
6286 ZFS internal error when set large block on bootfs
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Andriy Gapon <avg@FreeBSD.org>
Approved by: Robert Mustacchi <rm@joyent.com>
Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
OpenZFS-issue: https://www.illumos.org/issues/6286
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/6de9bb5
Closes #4585
Diffstat (limited to 'module/zfs/zfs_ioctl.c')
| -rw-r--r-- | module/zfs/zfs_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 6cc50e6da628..7969f525ef6f 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -26,7 +26,7 @@ * Copyright (c) 2012, Joyent, Inc. 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. * Copyright (c) 2016 Actifio, Inc. All rights reserved. @@ -3766,7 +3766,7 @@ zfs_check_settable(const char *dsname, nvpair_t *pair, cred_t *cr) */ if (zfs_is_bootfs(dsname) && intval > SPA_OLD_MAXBLOCKSIZE) { - return (SET_ERROR(EDOM)); + return (SET_ERROR(ERANGE)); } /* @@ -3775,7 +3775,7 @@ zfs_check_settable(const char *dsname, nvpair_t *pair, cred_t *cr) */ 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); |