Commit 72c04902 authored by Al Viro's avatar Al Viro

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

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 641cf4a6
...@@ -2122,10 +2122,8 @@ static void btrfs_read_locked_inode(struct inode *inode) ...@@ -2122,10 +2122,8 @@ static void btrfs_read_locked_inode(struct inode *inode)
* any xattrs or acls * any xattrs or acls
*/ */
maybe_acls = acls_after_inode_item(leaf, path->slots[0], inode->i_ino); maybe_acls = acls_after_inode_item(leaf, path->slots[0], inode->i_ino);
if (!maybe_acls) { if (!maybe_acls)
inode->i_acl = NULL; cache_no_acl(inode);
inode->i_default_acl = NULL;
}
BTRFS_I(inode)->block_group = btrfs_find_block_group(root, 0, BTRFS_I(inode)->block_group = btrfs_find_block_group(root, 0,
alloc_group_block, 0); alloc_group_block, 0);
......
...@@ -284,8 +284,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode) ...@@ -284,8 +284,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
struct posix_acl *acl, *clone; struct posix_acl *acl, *clone;
int rc; int rc;
inode->i_default_acl = NULL; cache_no_acl(inode);
inode->i_acl = NULL;
if (S_ISLNK(*i_mode)) if (S_ISLNK(*i_mode))
return 0; /* Symlink always has no-ACL */ return 0; /* Symlink always has no-ACL */
......
...@@ -148,4 +148,13 @@ static inline void forget_cached_acl(struct inode *inode, int type) ...@@ -148,4 +148,13 @@ static inline void forget_cached_acl(struct inode *inode, int type)
posix_acl_release(old); posix_acl_release(old);
} }
#endif #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 */ #endif /* __LINUX_POSIX_ACL_H */
...@@ -1558,6 +1558,7 @@ static struct inode *shmem_get_inode(struct super_block *sb, int mode, ...@@ -1558,6 +1558,7 @@ static struct inode *shmem_get_inode(struct super_block *sb, int mode,
spin_lock_init(&info->lock); spin_lock_init(&info->lock);
info->flags = flags & VM_NORESERVE; info->flags = flags & VM_NORESERVE;
INIT_LIST_HEAD(&info->swaplist); INIT_LIST_HEAD(&info->swaplist);
cache_no_acl(inode);
switch (mode & S_IFMT) { switch (mode & S_IFMT) {
default: default:
...@@ -2379,10 +2380,6 @@ static struct inode *shmem_alloc_inode(struct super_block *sb) ...@@ -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); p = (struct shmem_inode_info *)kmem_cache_alloc(shmem_inode_cachep, GFP_KERNEL);
if (!p) if (!p)
return NULL; 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; return &p->vfs_inode;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment