switch reiserfs to inode->i_acl
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -56,15 +56,6 @@ int reiserfs_cache_default_acl(struct inode *dir);
|
||||
extern struct xattr_handler reiserfs_posix_acl_default_handler;
|
||||
extern struct xattr_handler reiserfs_posix_acl_access_handler;
|
||||
|
||||
static inline void reiserfs_init_acl_access(struct inode *inode)
|
||||
{
|
||||
REISERFS_I(inode)->i_acl_access = ACL_NOT_CACHED;
|
||||
}
|
||||
|
||||
static inline void reiserfs_init_acl_default(struct inode *inode)
|
||||
{
|
||||
REISERFS_I(inode)->i_acl_default = ACL_NOT_CACHED;
|
||||
}
|
||||
#else
|
||||
|
||||
#define reiserfs_cache_default_acl(inode) 0
|
||||
@@ -86,12 +77,4 @@ reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void reiserfs_init_acl_access(struct inode *inode)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void reiserfs_init_acl_default(struct inode *inode)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
@@ -54,10 +54,6 @@ struct reiserfs_inode_info {
|
||||
unsigned int i_trans_id;
|
||||
struct reiserfs_journal_list *i_jl;
|
||||
struct mutex i_mmap;
|
||||
#ifdef CONFIG_REISERFS_FS_POSIX_ACL
|
||||
struct posix_acl *i_acl_access;
|
||||
struct posix_acl *i_acl_default;
|
||||
#endif
|
||||
#ifdef CONFIG_REISERFS_FS_XATTR
|
||||
struct rw_semaphore i_xattr_sem;
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user