Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

This commit is contained in:
Brian Behlendorf 2009-01-09 16:12:00 -08:00
parent 12dea1ad1d 4e42f2fd75
commit 9b92e05a39
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/zfs/zfs_ioctl.c
View File

@ -1520,6 +1520,7 @@ zfs_set_prop_nvlist(const char *name, nvlist_t *nvl)
return (error); return (error);
break; break;
#ifdef HAVE_ZVOL
case ZFS_PROP_VOLSIZE: case ZFS_PROP_VOLSIZE:
if ((error = nvpair_value_uint64(elem, &intval)) != 0 || if ((error = nvpair_value_uint64(elem, &intval)) != 0 ||
(error = zvol_set_volsize(name, (error = zvol_set_volsize(name,
@ -1532,6 +1533,11 @@ zfs_set_prop_nvlist(const char *name, nvlist_t *nvl)
(error = zvol_set_volblocksize(name, intval)) != 0) (error = zvol_set_volblocksize(name, intval)) != 0)
return (error); return (error);
break; break;
#else
case ZFS_PROP_VOLSIZE:
case ZFS_PROP_VOLBLOCKSIZE:
return (ENOTSUP);
#endif /* HAVE_ZVOL */
case ZFS_PROP_VERSION: case ZFS_PROP_VERSION:
if ((error = nvpair_value_uint64(elem, &intval)) != 0 || if ((error = nvpair_value_uint64(elem, &intval)) != 0 ||