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

Merge commit 'refs/top-bases/linux-zpios' into linux-zpios

This commit is contained in:
Brian Behlendorf 2009-07-09 15:11:47 -07:00
parent a3a9c56aa1 24662d61d9
commit 0539df32a1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/zfs/zfs_ioctl.c
View File

@ -1608,8 +1608,8 @@ zfs_set_prop_nvlist(const char *name, nvlist_t *nvl)
*/ */
if (zfs_prop_user(propname) && if (zfs_prop_user(propname) &&
nvpair_type(elem) == DATA_TYPE_STRING) { nvpair_type(elem) == DATA_TYPE_STRING) {
if (error = zfs_secpolicy_write_perms(name, if ((error = zfs_secpolicy_write_perms(name,
ZFS_DELEG_PERM_USERPROP, CRED())) ZFS_DELEG_PERM_USERPROP, CRED())))
return (error); return (error);
continue; continue;
} }
@ -1623,8 +1623,8 @@ zfs_set_prop_nvlist(const char *name, nvlist_t *nvl)
perm = ZFS_DELEG_PERM_USERQUOTA; perm = ZFS_DELEG_PERM_USERQUOTA;
else else
perm = ZFS_DELEG_PERM_GROUPQUOTA; perm = ZFS_DELEG_PERM_GROUPQUOTA;
if (error = zfs_secpolicy_write_perms(name, if ((error = zfs_secpolicy_write_perms(name,
perm, CRED())) perm, CRED())))
return (error); return (error);
continue; continue;
} }
@ -1864,8 +1864,8 @@ zfs_check_userprops(char *fsname, nvlist_t *nvl)
nvpair_type(elem) != DATA_TYPE_STRING) nvpair_type(elem) != DATA_TYPE_STRING)
return (EINVAL); return (EINVAL);
if (error = zfs_secpolicy_write_perms(fsname, if ((error = zfs_secpolicy_write_perms(fsname,
ZFS_DELEG_PERM_USERPROP, CRED())) ZFS_DELEG_PERM_USERPROP, CRED())))
return (error); return (error);
if (strlen(propname) >= ZAP_MAXNAMELEN) if (strlen(propname) >= ZAP_MAXNAMELEN)