Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / linux / reiserfs_acl.h

diff --git a/include/linux/reiserfs_acl.h b/include/linux/reiserfs_acl.h
index 2aef9c3..806ec5b 100644 (file)
--- a/include/linux/reiserfs_acl.h
+++ b/include/linux/reiserfs_acl.h
@@ -1,33 +1,32 @@
 #include <linux/init.h>
 #include <linux/posix_acl.h>
-#include <linux/xattr_acl.h>
 
 #define REISERFS_ACL_VERSION   0x0001
 
 typedef struct {
-       __le16          e_tag;
-       __le16          e_perm;
-       __le32          e_id;
+       __le16 e_tag;
+       __le16 e_perm;
+       __le32 e_id;
 } reiserfs_acl_entry;
 
 typedef struct {
-       __le16          e_tag;
-       __le16          e_perm;
+       __le16 e_tag;
+       __le16 e_perm;
 } reiserfs_acl_entry_short;
 
 typedef struct {
-       __le32          a_version;
+       __le32 a_version;
 } reiserfs_acl_header;
 
 static inline size_t reiserfs_acl_size(int count)
 {
        if (count <= 4) {
                return sizeof(reiserfs_acl_header) +
-                      count * sizeof(reiserfs_acl_entry_short);
+                   count * sizeof(reiserfs_acl_entry_short);
        } else {
                return sizeof(reiserfs_acl_header) +
-                      4 * sizeof(reiserfs_acl_entry_short) +
-                      (count - 4) * sizeof(reiserfs_acl_entry);
+                   4 * sizeof(reiserfs_acl_entry_short) +
+                   (count - 4) * sizeof(reiserfs_acl_entry);
        }
 }
 
@@ -47,43 +46,45 @@ 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, 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);
+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,
+                                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_get_acl NULL
 #define reiserfs_cache_default_acl(inode) 0
 
-static inline int
-reiserfs_xattr_posix_acl_init (void)
+static inline struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
 {
-    return 0;
+       return NULL;
 }
 
-static inline int
-reiserfs_xattr_posix_acl_exit (void)
+static inline int reiserfs_xattr_posix_acl_init(void)
 {
-    return 0;
+       return 0;
 }
 
-static inline int
-reiserfs_acl_chmod (struct inode *inode)
+static inline int reiserfs_xattr_posix_acl_exit(void)
+{
+       return 0;
+}
+
+static inline int reiserfs_acl_chmod(struct inode *inode)
 {
-    return 0;
+       return 0;
 }
 
 static inline int
-reiserfs_inherit_default_acl (const struct inode *dir, struct dentry *dentry, struct inode *inode)
+reiserfs_inherit_default_acl(const struct inode *dir, struct dentry *dentry,
+                            struct inode *inode)
 {
-    return 0;
+       return 0;
 }
 
 #endif