diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-05-30 11:55:38 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-05-30 11:55:38 -0400 |
| commit | cfc442b69696b593cb442f09997dcb4cb5748171 (patch) | |
| tree | 84a28a271ad14a695507df65af4ac0c83e64217c /fs/btrfs/acl.c | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
| parent | 48235a68a3d1db579fc20d9915815228a1825757 (diff) | |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into HEAD
Diffstat (limited to 'fs/btrfs/acl.c')
| -rw-r--r-- | fs/btrfs/acl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 89b156d85d63..761e2cd8fed1 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -227,7 +227,11 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans, if (ret > 0) { /* we need an acl */ ret = btrfs_set_acl(trans, inode, acl, ACL_TYPE_ACCESS); + } else { + cache_no_acl(inode); } + } else { + cache_no_acl(inode); } failed: posix_acl_release(acl); |