diff options
| author | Brian Behlendorf <[email protected]> | 2009-07-09 15:08:04 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-07-09 15:08:04 -0700 |
| commit | 2f4e745a09caad6f687bdfdb05844439b505f52f (patch) | |
| tree | 954ec98f30f441dbbe3188990b5b5cda4e46729f /module | |
| parent | a3bc97c2c33f97a9107f7302ac7ba20dffb6c6e9 (diff) | |
| parent | 893e11c6beafe7cb42a50ddb69d0f81f16231cf8 (diff) | |
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/zfs_ioctl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 46f907143..0b90ce789 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -1608,8 +1608,8 @@ zfs_set_prop_nvlist(const char *name, nvlist_t *nvl) */ if (zfs_prop_user(propname) && nvpair_type(elem) == DATA_TYPE_STRING) { - if (error = zfs_secpolicy_write_perms(name, - ZFS_DELEG_PERM_USERPROP, CRED())) + if ((error = zfs_secpolicy_write_perms(name, + ZFS_DELEG_PERM_USERPROP, CRED()))) return (error); continue; } @@ -1623,8 +1623,8 @@ zfs_set_prop_nvlist(const char *name, nvlist_t *nvl) perm = ZFS_DELEG_PERM_USERQUOTA; else perm = ZFS_DELEG_PERM_GROUPQUOTA; - if (error = zfs_secpolicy_write_perms(name, - perm, CRED())) + if ((error = zfs_secpolicy_write_perms(name, + perm, CRED()))) return (error); continue; } @@ -1864,8 +1864,8 @@ zfs_check_userprops(char *fsname, nvlist_t *nvl) nvpair_type(elem) != DATA_TYPE_STRING) return (EINVAL); - if (error = zfs_secpolicy_write_perms(fsname, - ZFS_DELEG_PERM_USERPROP, CRED())) + if ((error = zfs_secpolicy_write_perms(fsname, + ZFS_DELEG_PERM_USERPROP, CRED()))) return (error); if (strlen(propname) >= ZAP_MAXNAMELEN) |