fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / ext3 / acl.h

diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
index 9d9d9d2..0d1e627 100644 (file)
--- a/fs/ext3/acl.h
+++ b/fs/ext3/acl.h
@@ -4,24 +4,23 @@
   (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
 */
 
-#include <linux/xattr_acl.h>
+#include <linux/posix_acl_xattr.h>
 
 #define EXT3_ACL_VERSION       0x0001
-#define EXT3_ACL_MAX_ENTRIES   32
 
 typedef struct {
-       __u16           e_tag;
-       __u16           e_perm;
-       __u32           e_id;
+       __le16          e_tag;
+       __le16          e_perm;
+       __le32          e_id;
 } ext3_acl_entry;
 
 typedef struct {
-       __u16           e_tag;
-       __u16           e_perm;
+       __le16          e_tag;
+       __le16          e_perm;
 } ext3_acl_entry_short;
 
 typedef struct {
-       __u32           a_version;
+       __le32          a_version;
 } ext3_acl_header;
 
 static inline size_t ext3_acl_size(int count)
@@ -63,9 +62,6 @@ extern int ext3_permission (struct inode *, int, struct nameidata *);
 extern int ext3_acl_chmod (struct inode *);
 extern int ext3_init_acl (handle_t *, struct inode *, struct inode *);
 
-extern int init_ext3_acl(void);
-extern void exit_ext3_acl(void);
-
 #else  /* CONFIG_EXT3_FS_POSIX_ACL */
 #include <linux/sched.h>
 #define ext3_permission NULL
@@ -79,7 +75,6 @@ ext3_acl_chmod(struct inode *inode)
 static inline int
 ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
 {
-       inode->i_mode &= ~current->fs->umask;
        return 0;
 }
 #endif  /* CONFIG_EXT3_FS_POSIX_ACL */