diff options
| author | Brian Behlendorf <[email protected]> | 2017-03-07 19:21:37 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-03-10 09:51:33 -0800 |
| commit | 0037b49e833a7073bee0ef3f6680f330f727769e (patch) | |
| tree | 24404e9e670d391e7821cb14be839b8ed6dd37d7 /include/sys/zfs_fuid.h | |
| parent | ef1bdf363c021525c1db9630647dea73498c6bfd (diff) | |
Rename zfs_sb_t -> zfsvfs_t
The use of zfs_sb_t instead of zfsvfs_t results in unnecessary
conflicts with the upstream source. Change all instances of
zfs_sb_t to zfsvfs_t including updating the variables names.
Whenever possible the code was updated to be consistent with
hope it appears in the upstream OpenZFS source.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'include/sys/zfs_fuid.h')
| -rw-r--r-- | include/sys/zfs_fuid.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/include/sys/zfs_fuid.h b/include/sys/zfs_fuid.h index deaebcc82..0feb3ce4b 100644 --- a/include/sys/zfs_fuid.h +++ b/include/sys/zfs_fuid.h @@ -33,7 +33,6 @@ #include <sys/zfs_vfsops.h> #endif #include <sys/avl.h> -#include <sys/list.h> #ifdef __cplusplus extern "C" { @@ -100,24 +99,24 @@ typedef struct zfs_fuid_info { #ifdef _KERNEL struct znode; -extern uid_t zfs_fuid_map_id(zfs_sb_t *, uint64_t, cred_t *, zfs_fuid_type_t); +extern uid_t zfs_fuid_map_id(zfsvfs_t *, uint64_t, cred_t *, zfs_fuid_type_t); extern void zfs_fuid_node_add(zfs_fuid_info_t **, const char *, uint32_t, uint64_t, uint64_t, zfs_fuid_type_t); -extern void zfs_fuid_destroy(zfs_sb_t *); -extern uint64_t zfs_fuid_create_cred(zfs_sb_t *, zfs_fuid_type_t, +extern void zfs_fuid_destroy(zfsvfs_t *); +extern uint64_t zfs_fuid_create_cred(zfsvfs_t *, zfs_fuid_type_t, cred_t *, zfs_fuid_info_t **); -extern uint64_t zfs_fuid_create(zfs_sb_t *, uint64_t, cred_t *, zfs_fuid_type_t, +extern uint64_t zfs_fuid_create(zfsvfs_t *, uint64_t, cred_t *, zfs_fuid_type_t, zfs_fuid_info_t **); extern void zfs_fuid_map_ids(struct znode *zp, cred_t *cr, uid_t *uid, uid_t *gid); extern zfs_fuid_info_t *zfs_fuid_info_alloc(void); extern void zfs_fuid_info_free(zfs_fuid_info_t *); -extern boolean_t zfs_groupmember(zfs_sb_t *, uint64_t, cred_t *); -void zfs_fuid_sync(zfs_sb_t *, dmu_tx_t *); -extern int zfs_fuid_find_by_domain(zfs_sb_t *, const char *domain, +extern boolean_t zfs_groupmember(zfsvfs_t *, uint64_t, cred_t *); +void zfs_fuid_sync(zfsvfs_t *, dmu_tx_t *); +extern int zfs_fuid_find_by_domain(zfsvfs_t *, const char *domain, char **retdomain, boolean_t addok); -extern const char *zfs_fuid_find_by_idx(zfs_sb_t *zsb, uint32_t idx); -extern void zfs_fuid_txhold(zfs_sb_t *zsb, dmu_tx_t *tx); +extern const char *zfs_fuid_find_by_idx(zfsvfs_t *zfsvfs, uint32_t idx); +extern void zfs_fuid_txhold(zfsvfs_t *zfsvfs, dmu_tx_t *tx); #endif char *zfs_fuid_idx_domain(avl_tree_t *, uint32_t); |