Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent

This commit is contained in:
Brian Behlendorf 2009-01-09 15:52:00 -08:00
commit ca3acc4f50
1 changed files with 1 additions and 3 deletions

View File

@ -100,7 +100,6 @@ typedef struct zfs_fuid_info {
} zfs_fuid_info_t; } zfs_fuid_info_t;
#ifdef _KERNEL #ifdef _KERNEL
#ifndef HAVE_SPL
struct znode; struct znode;
extern uid_t zfs_fuid_map_id(zfsvfs_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_destroy(zfsvfs_t *); extern void zfs_fuid_destroy(zfsvfs_t *);
@ -113,8 +112,7 @@ extern void zfs_fuid_map_ids(struct znode *zp, cred_t *cr, uid_t *uid,
extern zfs_fuid_info_t *zfs_fuid_info_alloc(void); extern zfs_fuid_info_t *zfs_fuid_info_alloc(void);
extern void zfs_fuid_info_free(); extern void zfs_fuid_info_free();
extern boolean_t zfs_groupmember(zfsvfs_t *, uint64_t, cred_t *); extern boolean_t zfs_groupmember(zfsvfs_t *, uint64_t, cred_t *);
#endif /* !HAVE_SPL */ #endif
#endif /* _KERNEL */
char *zfs_fuid_idx_domain(avl_tree_t *, uint32_t); char *zfs_fuid_idx_domain(avl_tree_t *, uint32_t);
uint64_t zfs_fuid_table_load(objset_t *, uint64_t, avl_tree_t *, avl_tree_t *); uint64_t zfs_fuid_table_load(objset_t *, uint64_t, avl_tree_t *, avl_tree_t *);