Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a62f44a5 authored by Tsutomu Itoh's avatar Tsutomu Itoh Committed by Chris Mason
Browse files

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: default avatarTsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent f65647c2

fs/btrfs/tree-log.c

+5 −2
Original line number Diff line number Diff line
@@ -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;