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
VFS: Integrate zfs_znode_alloc()
[zfs.git]
/
module
/
zfs
/
zfs_fuid.c
diff --git
a/module/zfs/zfs_fuid.c
b/module/zfs/zfs_fuid.c
index
a853f4d
..
a574118
100644
(file)
--- a/
module/zfs/zfs_fuid.c
+++ b/
module/zfs/zfs_fuid.c
@@
-168,12
+168,12
@@
zfs_fuid_table_destroy(avl_tree_t *idx_tree, avl_tree_t *domain_tree)
void *cookie;
cookie = NULL;
void *cookie;
cookie = NULL;
- while (
domnode = avl_destroy_nodes(domain_tree, &cookie
))
+ while (
(domnode = avl_destroy_nodes(domain_tree, &cookie)
))
ksiddomain_rele(domnode->f_ksid);
avl_destroy(domain_tree);
cookie = NULL;
ksiddomain_rele(domnode->f_ksid);
avl_destroy(domain_tree);
cookie = NULL;
- while (
domnode = avl_destroy_nodes(idx_tree, &cookie
))
+ while (
(domnode = avl_destroy_nodes(idx_tree, &cookie)
))
kmem_free(domnode, sizeof (fuid_domain_t));
avl_destroy(idx_tree);
}
kmem_free(domnode, sizeof (fuid_domain_t));
avl_destroy(idx_tree);
}
@@
-396,6
+396,7
@@
uid_t
zfs_fuid_map_id(zfsvfs_t *zfsvfs, uint64_t fuid,
cred_t *cr, zfs_fuid_type_t type)
{
zfs_fuid_map_id(zfsvfs_t *zfsvfs, uint64_t fuid,
cred_t *cr, zfs_fuid_type_t type)
{
+#ifdef HAVE_KSID
uint32_t index = FUID_INDEX(fuid);
const char *domain;
uid_t id;
uint32_t index = FUID_INDEX(fuid);
const char *domain;
uid_t id;
@@
-414,6
+415,12
@@
zfs_fuid_map_id(zfsvfs_t *zfsvfs, uint64_t fuid,
FUID_RID(fuid), &id);
}
return (id);
FUID_RID(fuid), &id);
}
return (id);
+#else
+ if(type == ZFS_OWNER || type == ZFS_ACE_USER)
+ return (crgetuid(cr));
+ else
+ return (crgetgid(cr));
+#endif /* HAVE_KSID */
}
/*
}
/*
@@
-482,6
+489,7
@@
zfs_fuid_node_add(zfs_fuid_info_t **fuidpp, const char *domain, uint32_t rid,
}
}
}
}
+#ifdef HAVE_KSID
/*
* Create a file system FUID, based on information in the users cred
*
/*
* Create a file system FUID, based on information in the users cred
*
@@
-534,6
+542,7
@@
zfs_fuid_create_cred(zfsvfs_t *zfsvfs, zfs_fuid_type_t type,
return (FUID_ENCODE(idx, rid));
}
return (FUID_ENCODE(idx, rid));
}
+#endif /* HAVE_KSID */
/*
* Create a file system FUID for an ACL ace
/*
* Create a file system FUID for an ACL ace
@@
-551,6
+560,7
@@
uint64_t
zfs_fuid_create(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr,
zfs_fuid_type_t type, zfs_fuid_info_t **fuidpp)
{
zfs_fuid_create(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr,
zfs_fuid_type_t type, zfs_fuid_info_t **fuidpp)
{
+#ifdef HAVE_KSID
const char *domain;
char *kdomain;
uint32_t fuid_idx = FUID_INDEX(id);
const char *domain;
char *kdomain;
uint32_t fuid_idx = FUID_INDEX(id);
@@
-629,6
+639,12
@@
zfs_fuid_create(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr,
kmem_free(zfuid, sizeof (zfs_fuid_t));
}
return (FUID_ENCODE(idx, rid));
kmem_free(zfuid, sizeof (zfs_fuid_t));
}
return (FUID_ENCODE(idx, rid));
+#else
+ if (type == ZFS_OWNER)
+ return crgetuid(cr);
+ else
+ return crgetgid(cr);
+#endif
}
void
}
void
@@
-696,6
+712,7
@@
zfs_fuid_info_free(zfs_fuid_info_t *fuidp)
boolean_t
zfs_groupmember(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr)
{
boolean_t
zfs_groupmember(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr)
{
+#ifdef HAVE_KSID
ksid_t *ksid = crgetsid(cr, KSID_GROUP);
ksidlist_t *ksidlist = crgetsidlist(cr);
uid_t gid;
ksid_t *ksid = crgetsid(cr, KSID_GROUP);
ksidlist_t *ksidlist = crgetsidlist(cr);
uid_t gid;
@@
-737,6
+754,9
@@
zfs_groupmember(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr)
*/
gid = zfs_fuid_map_id(zfsvfs, id, cr, ZFS_GROUP);
return (groupmember(gid, cr));
*/
gid = zfs_fuid_map_id(zfsvfs, id, cr, ZFS_GROUP);
return (groupmember(gid, cr));
+#else
+ return (B_TRUE);
+#endif
}
void
}
void