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
Add Solaris FMA style support
[zfs.git]
/
module
/
zfs
/
dsl_deleg.c
diff --git
a/module/zfs/dsl_deleg.c
b/module/zfs/dsl_deleg.c
index
da5d157
..
5d76ff5
100644
(file)
--- a/
module/zfs/dsl_deleg.c
+++ b/
module/zfs/dsl_deleg.c
@@
-19,7
+19,7
@@
* CDDL HEADER END
*/
/*
* CDDL HEADER END
*/
/*
- * Copyright 200
8
Sun Microsystems, Inc. All rights reserved.
+ * Copyright 200
9
Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
* Use is subject to license terms.
*/
@@
-66,8
+66,6
@@
* The ZAP OBJ is referred to as the jump object.
*/
* The ZAP OBJ is referred to as the jump object.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/dmu.h>
#include <sys/dmu_objset.h>
#include <sys/dmu_tx.h>
#include <sys/dmu.h>
#include <sys/dmu_objset.h>
#include <sys/dmu_tx.h>
@@
-540,7
+538,7
@@
dsl_deleg_access(const char *dsname, const char *perm, cred_t *cr)
dsl_pool_t *dp;
void *cookie;
int error;
dsl_pool_t *dp;
void *cookie;
int error;
- char checkflag
= ZFS_DELEG_LOCAL
;
+ char checkflag;
objset_t *mos;
avl_tree_t permsets;
perm_set_t *setnode;
objset_t *mos;
avl_tree_t permsets;
perm_set_t *setnode;
@@
-563,6
+561,16
@@
dsl_deleg_access(const char *dsname, const char *perm, cred_t *cr)
return (EPERM);
}
return (EPERM);
}
+ if (dsl_dataset_is_snapshot(ds)) {
+ /*
+ * Snapshots are treated as descendents only,
+ * local permissions do not apply.
+ */
+ checkflag = ZFS_DELEG_DESCENDENT;
+ } else {
+ checkflag = ZFS_DELEG_LOCAL;
+ }
+
avl_create(&permsets, perm_set_compare, sizeof (perm_set_t),
offsetof(perm_set_t, p_node));
avl_create(&permsets, perm_set_compare, sizeof (perm_set_t),
offsetof(perm_set_t, p_node));