diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-24 16:58:48 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-24 16:58:48 -0400 |
| commit | 72c04902d1e27c8a324014cff1d4475c11b1cecd (patch) | |
| tree | 3e93abdd0a3eeedd6df5a1dc43170744f2fa7664 /fs | |
| parent | 641cf4a668e9e69d2bc061e953422ff72a91f86e (diff) | |
| download | kernel-crypto-72c04902d1e27c8a324014cff1d4475c11b1cecd.tar.gz kernel-crypto-72c04902d1e27c8a324014cff1d4475c11b1cecd.tar.xz kernel-crypto-72c04902d1e27c8a324014cff1d4475c11b1cecd.zip | |
Get "no acls for this inode" right, fix shmem breakage
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 6 | ||||
| -rw-r--r-- | fs/jffs2/acl.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 78ad38ddd01..dbe1aabf96c 100644 --- 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 edd2ad6416d..8fcb6239218 100644 --- 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 */ |