#ifdef CONFIG_REISERFS_FS_POSIX_ACL
struct posix_acl *reiserfs_get_acl(struct inode *inode, int type);
int reiserfs_acl_chmod(struct inode *inode);
-int reiserfs_inherit_default_acl(struct inode *dir, struct dentry *dentry,
+int reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
+ struct inode *dir, struct dentry *dentry,
struct inode *inode);
int reiserfs_cache_default_acl(struct inode *dir);
-extern int reiserfs_xattr_posix_acl_init(void) __init;
-extern int reiserfs_xattr_posix_acl_exit(void);
-extern struct reiserfs_xattr_handler posix_acl_default_handler;
-extern struct reiserfs_xattr_handler posix_acl_access_handler;
-#else
-
-#define reiserfs_cache_default_acl(inode) 0
+extern struct xattr_handler reiserfs_posix_acl_default_handler;
+extern struct xattr_handler reiserfs_posix_acl_access_handler;
-static inline struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
+static inline void reiserfs_init_acl_access(struct inode *inode)
{
- return NULL;
+ REISERFS_I(inode)->i_acl_access = NULL;
}
-static inline int reiserfs_xattr_posix_acl_init(void)
+static inline void reiserfs_init_acl_default(struct inode *inode)
{
- return 0;
+ REISERFS_I(inode)->i_acl_default = NULL;
}
+#else
+
+#define reiserfs_cache_default_acl(inode) 0
-static inline int reiserfs_xattr_posix_acl_exit(void)
+static inline struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
{
- return 0;
+ return NULL;
}
static inline int reiserfs_acl_chmod(struct inode *inode)
return 0;
}
+static inline void reiserfs_init_acl_access(struct inode *inode)
+{
+}
+
+static inline void reiserfs_init_acl_default(struct inode *inode)
+{
+}
#endif