]> git.baikalelectronics.ru Git - kernel.git/commit
btrfs: avoid blocking open_ctree from cleaner_kthread
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Mon, 13 Jun 2016 03:39:58 +0000 (23:39 -0400)
committerDavid Sterba <dsterba@suse.com>
Fri, 17 Jun 2016 16:32:40 +0000 (18:32 +0200)
commit29f047925a8ecd74d624af9afe9360747933597e
tree556934ae4488ebae6490610894bbfe92bd405478
parent6d0d0dfc1ff725578d1ece4a120a3e8b8fbf4824
btrfs: avoid blocking open_ctree from cleaner_kthread

This fixes a problem introduced in commit 897badd68d6bfe71c1ba4d39d3f29a7539aefd08
"btrfs: don't force mounts to wait for cleaner_kthread to delete one or more subvolumes".

open_ctree eventually calls btrfs_replay_log which in turn calls
btrfs_commit_super which tries to lock the cleaner_mutex, causing a
recursive mutex deadlock during mount.

Instead of playing whack-a-mole trying to keep up with all the
functions that may want to lock cleaner_mutex, put all the cleaner_mutex
lockers back where they were, and attack the problem more directly:
keep cleaner_kthread asleep until the filesystem is mounted.

When filesystems are mounted read-only and later remounted read-write,
open_ctree did not set fs_info->open and neither does anything else.
Set this flag in btrfs_remount so that neither btrfs_delete_unused_bgs
nor cleaner_kthread get confused by the common case of "/" filesystem
read-only mount followed by read-write remount.

Signed-off-by: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/disk-io.c
fs/btrfs/super.c