diff options
| author | smh <smh@FreeBSD.org> | 2015-01-21 09:45:48 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2015-01-21 09:45:48 +0000 |
| commit | 13bbed0129b77cd1cf205b4c2eb378c68d56e923 (patch) | |
| tree | 07b1c24ce4d495942a06c1a1af4bb1b5be98adc9 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | |
| parent | 48282fa7cc9bc6b7e908f1be9747e5c5eed1375f (diff) | |
| download | FreeBSD-src-13bbed0129b77cd1cf205b4c2eb378c68d56e923.zip FreeBSD-src-13bbed0129b77cd1cf205b4c2eb378c68d56e923.tar.gz | |
MFC r276063:
Standardise on illumos for #ifdef's in zvol.c
MFC r276066:
Refactor zvol locking to minimise diff with upstream
MFC r276069:
Fix panic when resizing ZFS zvol's
Sponsored by: Multiplay
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index 68a5025..857c080 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -2483,8 +2483,7 @@ zfs_prop_set_special(const char *dsname, zprop_source_t source, err = dsl_dataset_set_refreservation(dsname, source, intval); break; case ZFS_PROP_VOLSIZE: - err = zvol_set_volsize(dsname, ddi_driver_major(zfs_dip), - intval); + err = zvol_set_volsize(dsname, intval); break; case ZFS_PROP_VERSION: { |
