summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTsutomu Itoh <t-itoh@jp.fujitsu.com>2011-04-25 19:43:51 -0400
committerChris Mason <chris.mason@oracle.com>2011-04-25 19:43:51 -0400
commita62f44a5f47ce45e524b55f91542dc386c6de7ef (patch)
tree9385c5bb077e74a9e97ce048d8e615142366cc52 /fs
parentf65647c29b14f5a32ff6f3237b0ef3b375ed5a79 (diff)
downloadlinux-3.10-a62f44a5f47ce45e524b55f91542dc386c6de7ef.tar.gz
linux-3.10-a62f44a5f47ce45e524b55f91542dc386c6de7ef.tar.bz2
linux-3.10-a62f44a5f47ce45e524b55f91542dc386c6de7ef.zip
Btrfs: fix missing mutex_unlock in btrfs_del_dir_entries_in_log()
It is necessary to unlock mutex_lock before it return an error when btrfs_alloc_path() fails. Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/tree-log.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index c50271ad315..f997ec0c1ba 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2209,8 +2209,10 @@ int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
log = root->log_root;
path = btrfs_alloc_path();
- if (!path)
- return -ENOMEM;
+ if (!path) {
+ err = -ENOMEM;
+ goto out_unlock;
+ }
di = btrfs_lookup_dir_item(trans, log, path, dir->i_ino,
name, name_len, -1);
@@ -2271,6 +2273,7 @@ int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
}
fail:
btrfs_free_path(path);
+out_unlock:
mutex_unlock(&BTRFS_I(dir)->log_mutex);
if (ret == -ENOSPC) {
root->fs_info->last_trans_log_full_commit = trans->transid;