]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Btrfs: fix missing mutex_unlock in btrfs_del_dir_entries_in_log()
authorTsutomu Itoh <t-itoh@jp.fujitsu.com>
Mon, 25 Apr 2011 23:43:51 +0000 (19:43 -0400)
committerChris Mason <chris.mason@oracle.com>
Mon, 25 Apr 2011 23:43:51 +0000 (19:43 -0400)
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>
fs/btrfs/tree-log.c

index c50271ad3157675059656d8113e9804cf3872dfb..f997ec0c1ba4b8efb6b46f88160de43cda3da4f2 100644 (file)
@@ -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;