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
Make spl directory setable when building rpms and add --buildroot
[zfs.git]
/
module
/
zfs
/
dsl_deleg.c
diff --git
a/module/zfs/dsl_deleg.c
b/module/zfs/dsl_deleg.c
index
a4d4e42
..
294932c
100644
(file)
--- a/
module/zfs/dsl_deleg.c
+++ b/
module/zfs/dsl_deleg.c
@@
-20,7
+20,7
@@
*/
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 201
1
by Delphix. All rights reserved.
+ * Copyright (c) 201
2
by Delphix. All rights reserved.
*/
/*
*/
/*
@@
-171,10
+171,8
@@
dsl_deleg_set_sync(void *arg1, void *arg2, dmu_tx_t *tx)
VERIFY(nvpair_value_nvlist(whopair, &perms) == 0);
if (zap_lookup(mos, zapobj, whokey, 8, 1, &jumpobj) != 0) {
VERIFY(nvpair_value_nvlist(whopair, &perms) == 0);
if (zap_lookup(mos, zapobj, whokey, 8, 1, &jumpobj) != 0) {
- jumpobj = zap_create(mos, DMU_OT_DSL_PERMS,
- DMU_OT_NONE, 0, tx);
- VERIFY(zap_update(mos, zapobj,
- whokey, 8, 1, &jumpobj, tx) == 0);
+ jumpobj = zap_create_link(mos, DMU_OT_DSL_PERMS,
+ zapobj, whokey, tx);
}
while ((permpair = nvlist_next_nvpair(perms, permpair))) {
}
while ((permpair = nvlist_next_nvpair(perms, permpair))) {