Get "no acls for this inode" right, fix shmem breakage

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

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 78ad38ddd01fb932d96e50716ced48699d67ebdc..dbe1aabf96cd918d43e31160e5953621f8835983 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2122,10 +2122,8 @@ static void btrfs_read_locked_inode(struct inode *inode)
         * any xattrs or acls
         */
        maybe_acls = acls_after_inode_item(leaf, path->slots[0], inode->i_ino);
-       if (!maybe_acls) {
-               inode->i_acl = NULL;
-               inode->i_default_acl = NULL;
-       }
+       if (!maybe_acls)
+               cache_no_acl(inode);
 
        BTRFS_I(inode)->block_group = btrfs_find_block_group(root, 0,
                                                alloc_group_block, 0);

diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index edd2ad6416d87130fb1b5b14fa6a5fabc3684596..8fcb6239218e53b7b9ced59a0ee9a854f4c77175 100644 (file)
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -284,8 +284,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
        struct posix_acl *acl, *clone;
        int rc;
 
-       inode->i_default_acl = NULL;
-       inode->i_acl = NULL;
+       cache_no_acl(inode);
 
        if (S_ISLNK(*i_mode))
                return 0;       /* Symlink always has no-ACL */

diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index c513466c7dc77ae7f7c73c755c457f4da1715172..065a3652a3eaf92a8381db3f35e78f86e470a488 100644 (file)
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -148,4 +148,13 @@ static inline void forget_cached_acl(struct inode *inode, int type)
                posix_acl_release(old);
 }
 #endif
+
+static inline void cache_no_acl(struct inode *inode)
+{
+#ifdef CONFIG_FS_POSIX_ACL
+       inode->i_acl = NULL;
+       inode->i_default_acl = NULL;
+#endif
+}
+
 #endif  /* __LINUX_POSIX_ACL_H */

diff --git a/mm/shmem.c b/mm/shmem.c
index 5f2019fc7895909899c58893e0aa031c01b930f5..d713239ce2ce72be6097a1ad478ce1b04798773d 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1558,6 +1558,7 @@ static struct inode *shmem_get_inode(struct super_block *sb, int mode,
                spin_lock_init(&info->lock);
                info->flags = flags & VM_NORESERVE;
                INIT_LIST_HEAD(&info->swaplist);
+               cache_no_acl(inode);
 
                switch (mode & S_IFMT) {
                default:
@@ -2379,10 +2380,6 @@ static struct inode *shmem_alloc_inode(struct super_block *sb)
        p = (struct shmem_inode_info *)kmem_cache_alloc(shmem_inode_cachep, GFP_KERNEL);
        if (!p)
                return NULL;
-#ifdef CONFIG_TMPFS_POSIX_ACL
-       p->vfs_inode.i_acl = NULL;
-       p->vfs_inode.i_default_acl = NULL;
-#endif
        return &p->vfs_inode;
 }