]> git.baikalelectronics.ru Git - kernel.git/commit
btrfs: zoned: move log tree node allocation out of log_root_tree->log_mutex
authorNaohiro Aota <naohiro.aota@wdc.com>
Wed, 24 Mar 2021 14:23:11 +0000 (23:23 +0900)
committerDavid Sterba <dsterba@suse.com>
Mon, 19 Apr 2021 15:25:17 +0000 (17:25 +0200)
commit4df8d04c98549a474738bad8e10917bdf73b2aca
tree05b633aa7269268f347323cd9f07303abc2a2231
parentdec40bc013b022dedeaf0919b18faf559eb10104
btrfs: zoned: move log tree node allocation out of log_root_tree->log_mutex

Commit 6ff6556bea22 ("btrfs: zoned: fix deadlock on log sync") pointed out
a deadlock warning and removed mutex_{lock,unlock} of fs_info::tree_root->log_mutex.
While it looks like it always cause a deadlock, we didn't see actual
deadlock in fstests runs. The reason is log_root_tree->log_mutex !=
fs_info->tree_root->log_mutex, not taking the same lock. So, the warning
was actually a false-positive.

Since btrfs_alloc_log_tree_node() is protected only by
fs_info->tree_root->log_mutex, we can (and should) move the code out of
the lock scope of log_root_tree->log_mutex and silence the warning.

Fixes: 6ff6556bea22 ("btrfs: zoned: fix deadlock on log sync")
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/tree-log.c