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] / fs / ext3 / acl.h

diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
index f83830d..92d50b5 100644 (file)
--- a/fs/ext3/acl.h
+++ b/fs/ext3/acl.h
@@ -4,10 +4,9 @@
   (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 {
        __le16          e_tag;
@@ -79,7 +78,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 */