diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-29 13:27:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-29 13:27:37 -0500 |
commit | 67f15b06c1a7e5417b7042b515ca2695de30beda (patch) | |
tree | ba93b80b40ba2a6d89adc74ed4be54b4626c56a3 /fs/btrfs/acl.c | |
parent | 94673e968cbcce07fa78dac4b0ae05d24b5816e1 (diff) | |
parent | 035fe03a7ad56982b30ab3a522b7b08d58feccd0 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: check total number of devices when removing missing
Btrfs: check return value of open_bdev_exclusive properly
Btrfs: do not mark the chunk as readonly if in degraded mode
Btrfs: run orphan cleanup on default fs root
Btrfs: fix a memory leak in btrfs_init_acl
Btrfs: Use correct values when updating inode i_size on fallocate
Btrfs: remove tree_search() in extent_map.c
Btrfs: Add mount -o compress-force
Diffstat (limited to 'fs/btrfs/acl.c')
-rw-r--r-- | fs/btrfs/acl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 54f4798ab46a..6df6d6ed74fd 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c | |||
@@ -244,6 +244,7 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans, | |||
244 | ACL_TYPE_ACCESS); | 244 | ACL_TYPE_ACCESS); |
245 | } | 245 | } |
246 | } | 246 | } |
247 | posix_acl_release(clone); | ||
247 | } | 248 | } |
248 | failed: | 249 | failed: |
249 | posix_acl_release(acl); | 250 | posix_acl_release(acl); |