switch ext4 to inode->i_acl

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index 605aeed96d68116589818b5c443b32d7f3ff01b0..0084e3a19d86395a72592aa783585a2927646ae1 100644 (file)
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -134,7 +134,7 @@ ext4_iget_acl(struct inode *inode, struct posix_acl **i_acl)
        if (acl) {
                spin_lock(&inode->i_lock);
                acl = *i_acl;
-               if (acl != EXT4_ACL_NOT_CACHED)
+               if (acl != ACL_NOT_CACHED)
                        acl = posix_acl_dup(acl);
                spin_unlock(&inode->i_lock);
        }
@@ -147,7 +147,7 @@ ext4_iset_acl(struct inode *inode, struct posix_acl **i_acl,
                struct posix_acl *acl)
 {
        spin_lock(&inode->i_lock);
-       if (*i_acl != EXT4_ACL_NOT_CACHED)
+       if (*i_acl != ACL_NOT_CACHED)
                posix_acl_release(*i_acl);
        *i_acl = posix_acl_dup(acl);
        spin_unlock(&inode->i_lock);
@@ -161,7 +161,6 @@ ext4_iset_acl(struct inode *inode, struct posix_acl **i_acl,
 static struct posix_acl *
 ext4_get_acl(struct inode *inode, int type)
 {
-       struct ext4_inode_info *ei = EXT4_I(inode);
        int name_index;
        char *value = NULL;
        struct posix_acl *acl;
@@ -172,15 +171,15 @@ ext4_get_acl(struct inode *inode, int type)
 
        switch (type) {
        case ACL_TYPE_ACCESS:
-               acl = ext4_iget_acl(inode, &ei->i_acl);
-               if (acl != EXT4_ACL_NOT_CACHED)
+               acl = ext4_iget_acl(inode, &inode->i_acl);
+               if (acl != ACL_NOT_CACHED)
                        return acl;
                name_index = EXT4_XATTR_INDEX_POSIX_ACL_ACCESS;
                break;
 
        case ACL_TYPE_DEFAULT:
-               acl = ext4_iget_acl(inode, &ei->i_default_acl);
-               if (acl != EXT4_ACL_NOT_CACHED)
+               acl = ext4_iget_acl(inode, &inode->i_default_acl);
+               if (acl != ACL_NOT_CACHED)
                        return acl;
                name_index = EXT4_XATTR_INDEX_POSIX_ACL_DEFAULT;
                break;
@@ -206,11 +205,11 @@ ext4_get_acl(struct inode *inode, int type)
        if (!IS_ERR(acl)) {
                switch (type) {
                case ACL_TYPE_ACCESS:
-                       ext4_iset_acl(inode, &ei->i_acl, acl);
+                       ext4_iset_acl(inode, &inode->i_acl, acl);
                        break;
 
                case ACL_TYPE_DEFAULT:
-                       ext4_iset_acl(inode, &ei->i_default_acl, acl);
+                       ext4_iset_acl(inode, &inode->i_default_acl, acl);
                        break;
                }
        }
@@ -226,7 +225,6 @@ static int
 ext4_set_acl(handle_t *handle, struct inode *inode, int type,
             struct posix_acl *acl)
 {
-       struct ext4_inode_info *ei = EXT4_I(inode);
        int name_index;
        void *value = NULL;
        size_t size = 0;
@@ -274,11 +272,11 @@ ext4_set_acl(handle_t *handle, struct inode *inode, int type,
        if (!error) {
                switch (type) {
                case ACL_TYPE_ACCESS:
-                       ext4_iset_acl(inode, &ei->i_acl, acl);
+                       ext4_iset_acl(inode, &inode->i_acl, acl);
                        break;
 
                case ACL_TYPE_DEFAULT:
-                       ext4_iset_acl(inode, &ei->i_default_acl, acl);
+                       ext4_iset_acl(inode, &inode->i_default_acl, acl);
                        break;
                }
        }

diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index cb45257a246e888467f8db4bfb6822b00e7fddd7..949789d2bba66b47805cc9adc008afdd7f150ca5 100644 (file)
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -53,10 +53,6 @@ static inline int ext4_acl_count(size_t size)
 
 #ifdef CONFIG_EXT4_FS_POSIX_ACL
 
-/* Value for inode->u.ext4_i.i_acl and inode->u.ext4_i.i_default_acl
-   if the ACL has not been cached */
-#define EXT4_ACL_NOT_CACHED ((void *)-1)
-
 /* acl.c */
 extern int ext4_permission(struct inode *, int);
 extern int ext4_acl_chmod(struct inode *);

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 17b9998680e3b30b479f0417bea5a9401334b606..0ddf7e55abe181e3ac1bd31fea3357bf4c1bf8a6 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -595,10 +595,6 @@ struct ext4_inode_info {
         */
        struct rw_semaphore xattr_sem;
 #endif
-#ifdef CONFIG_EXT4_FS_POSIX_ACL
-       struct posix_acl        *i_acl;
-       struct posix_acl        *i_default_acl;
-#endif
 
        struct list_head i_orphan;      /* unlinked but open inodes */
 

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 7c17ae275af4c0a0910bf5e7af7bc243199889de..60a26f3a6f8bd3e2ac5db8cfc220538630b7de6a 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4453,10 +4453,6 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
                return inode;
 
        ei = EXT4_I(inode);
-#ifdef CONFIG_EXT4_FS_POSIX_ACL
-       ei->i_acl = EXT4_ACL_NOT_CACHED;
-       ei->i_default_acl = EXT4_ACL_NOT_CACHED;
-#endif
 
        ret = __ext4_get_inode_loc(inode, &iloc, 0);
        if (ret < 0)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 8bb9e2d3e4b8dc69cdeb84086dea2f4bcfc4a519..8f4f079e6b9a2a850c459b8677f7911fd326f4ca 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -666,10 +666,6 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
        if (!ei)
                return NULL;
 
-#ifdef CONFIG_EXT4_FS_POSIX_ACL
-       ei->i_acl = EXT4_ACL_NOT_CACHED;
-       ei->i_default_acl = EXT4_ACL_NOT_CACHED;
-#endif
        ei->vfs_inode.i_version = 1;
        ei->vfs_inode.i_data.writeback_index = 0;
        memset(&ei->i_cached_extent, 0, sizeof(struct ext4_ext_cache));
@@ -735,18 +731,6 @@ static void destroy_inodecache(void)
 
 static void ext4_clear_inode(struct inode *inode)
 {
-#ifdef CONFIG_EXT4_FS_POSIX_ACL
-       if (EXT4_I(inode)->i_acl &&
-                       EXT4_I(inode)->i_acl != EXT4_ACL_NOT_CACHED) {
-               posix_acl_release(EXT4_I(inode)->i_acl);
-               EXT4_I(inode)->i_acl = EXT4_ACL_NOT_CACHED;
-       }
-       if (EXT4_I(inode)->i_default_acl &&
-                       EXT4_I(inode)->i_default_acl != EXT4_ACL_NOT_CACHED) {
-               posix_acl_release(EXT4_I(inode)->i_default_acl);
-               EXT4_I(inode)->i_default_acl = EXT4_ACL_NOT_CACHED;
-       }
-#endif
        ext4_discard_preallocations(inode);
        if (EXT4_JOURNAL(inode))
                jbd2_journal_release_jbd_inode(EXT4_SB(inode->i_sb)->s_journal,