git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix variables named current
[zfs.git]
/
module
/
zfs
/
dsl_deleg.c
diff --git
a/module/zfs/dsl_deleg.c
b/module/zfs/dsl_deleg.c
index
529fb05
..
4d7ec80
100644
(file)
--- a/
module/zfs/dsl_deleg.c
+++ b/
module/zfs/dsl_deleg.c
@@
-96,13
+96,13
@@
dsl_deleg_can_allow(char *ddname, nvlist_t *nvp, cred_t *cr)
if ((error = dsl_deleg_access(ddname, ZFS_DELEG_PERM_ALLOW, cr)) != 0)
return (error);
if ((error = dsl_deleg_access(ddname, ZFS_DELEG_PERM_ALLOW, cr)) != 0)
return (error);
- while (
whopair = nvlist_next_nvpair(nvp, whopair
)) {
+ while (
(whopair = nvlist_next_nvpair(nvp, whopair)
)) {
nvlist_t *perms;
nvpair_t *permpair = NULL;
VERIFY(nvpair_value_nvlist(whopair, &perms) == 0);
nvlist_t *perms;
nvpair_t *permpair = NULL;
VERIFY(nvpair_value_nvlist(whopair, &perms) == 0);
- while (
permpair = nvlist_next_nvpair(perms, permpair
)) {
+ while (
(permpair = nvlist_next_nvpair(perms, permpair)
)) {
const char *perm = nvpair_name(permpair);
if (strcmp(perm, ZFS_DELEG_PERM_ALLOW) == 0)
const char *perm = nvpair_name(permpair);
if (strcmp(perm, ZFS_DELEG_PERM_ALLOW) == 0)
@@
-133,7
+133,7
@@
dsl_deleg_can_unallow(char *ddname, nvlist_t *nvp, cred_t *cr)
(void) snprintf(idstr, sizeof (idstr), "%lld",
(longlong_t)crgetuid(cr));
(void) snprintf(idstr, sizeof (idstr), "%lld",
(longlong_t)crgetuid(cr));
- while (
whopair = nvlist_next_nvpair(nvp, whopair
)) {
+ while (
(whopair = nvlist_next_nvpair(nvp, whopair)
)) {
zfs_deleg_who_type_t type = nvpair_name(whopair)[0];
if (type != ZFS_DELEG_USER &&
zfs_deleg_who_type_t type = nvpair_name(whopair)[0];
if (type != ZFS_DELEG_USER &&
@@
-161,7
+161,7
@@
dsl_deleg_set_sync(void *arg1, void *arg2, dmu_tx_t *tx)
DMU_OT_DSL_PERMS, DMU_OT_NONE, 0, tx);
}
DMU_OT_DSL_PERMS, DMU_OT_NONE, 0, tx);
}
- while (
whopair = nvlist_next_nvpair(nvp, whopair
)) {
+ while (
(whopair = nvlist_next_nvpair(nvp, whopair)
)) {
const char *whokey = nvpair_name(whopair);
nvlist_t *perms;
nvpair_t *permpair = NULL;
const char *whokey = nvpair_name(whopair);
nvlist_t *perms;
nvpair_t *permpair = NULL;
@@
-176,7
+176,7
@@
dsl_deleg_set_sync(void *arg1, void *arg2, dmu_tx_t *tx)
whokey, 8, 1, &jumpobj, tx) == 0);
}
whokey, 8, 1, &jumpobj, tx) == 0);
}
- while (
permpair = nvlist_next_nvpair(perms, permpair
)) {
+ while (
(permpair = nvlist_next_nvpair(perms, permpair)
)) {
const char *perm = nvpair_name(permpair);
uint64_t n = 0;
const char *perm = nvpair_name(permpair);
uint64_t n = 0;
@@
-202,7
+202,7
@@
dsl_deleg_unset_sync(void *arg1, void *arg2, dmu_tx_t *tx)
if (zapobj == 0)
return;
if (zapobj == 0)
return;
- while (
whopair = nvlist_next_nvpair(nvp, whopair
)) {
+ while (
(whopair = nvlist_next_nvpair(nvp, whopair)
)) {
const char *whokey = nvpair_name(whopair);
nvlist_t *perms;
nvpair_t *permpair = NULL;
const char *whokey = nvpair_name(whopair);
nvlist_t *perms;
nvpair_t *permpair = NULL;
@@
-224,7
+224,7
@@
dsl_deleg_unset_sync(void *arg1, void *arg2, dmu_tx_t *tx)
if (zap_lookup(mos, zapobj, whokey, 8, 1, &jumpobj) != 0)
continue;
if (zap_lookup(mos, zapobj, whokey, 8, 1, &jumpobj) != 0)
continue;
- while (
permpair = nvlist_next_nvpair(perms, permpair
)) {
+ while (
(permpair = nvlist_next_nvpair(perms, permpair)
)) {
const char *perm = nvpair_name(permpair);
uint64_t n = 0;
const char *perm = nvpair_name(permpair);
uint64_t n = 0;
@@
-261,7
+261,7
@@
dsl_deleg_set(const char *ddname, nvlist_t *nvp, boolean_t unset)
return (ENOTSUP);
}
return (ENOTSUP);
}
- while (
whopair = nvlist_next_nvpair(nvp, whopair
))
+ while (
(whopair = nvlist_next_nvpair(nvp, whopair)
))
blocks_modified++;
error = dsl_sync_task_do(dd->dd_pool, NULL,
blocks_modified++;
error = dsl_sync_task_do(dd->dd_pool, NULL,