X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Freiserfs_acl.h;h=52240e02de026fdfd0657edf61a5b0aecdd0bb33;hb=0ab2621ebd9a28bf7a524ecd50d492a10579dfcc;hp=806ec5b067075554792d5631996b24595157d697;hpb=9caafa6c8686e319cf4d5f3757b3972c6c522b7c;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/reiserfs_acl.h b/include/linux/reiserfs_acl.h
index 806ec5b0670..52240e02de0 100644
--- a/include/linux/reiserfs_acl.h
+++ b/include/linux/reiserfs_acl.h
@@ -49,30 +49,29 @@ static inline int reiserfs_acl_count(size_t size)
 #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)
@@ -87,4 +86,11 @@ reiserfs_inherit_default_acl(const struct inode *dir, struct dentry *dentry,
 	return 0;
 }
 
+static inline void reiserfs_init_acl_access(struct inode *inode)
+{
+}
+
+static inline void reiserfs_init_acl_default(struct inode *inode)
+{
+}
 #endif