diff options
author | Jeff Mahoney <jeffm@suse.com> | 2016-08-15 12:10:33 -0400 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2016-08-25 06:58:19 -0400 |
commit | d2c609b834d62f1e91f1635a27dca29f7806d3d6 (patch) | |
tree | 446eb20c30b212f1ad9def7dc95cb156fd3a2951 /fs/btrfs/disk-io.c | |
parent | eecba891d38051ebf7f4af6394d188a5fd151a6a (diff) |
btrfs: properly track when rescan worker is running
The qgroup_flags field is overloaded such that it reflects the on-disk
status of qgroups and the runtime state. The BTRFS_QGROUP_STATUS_FLAG_RESCAN
flag is used to indicate that a rescan operation is in progress, but if
the file system is unmounted while a rescan is running, the rescan
operation is paused. If the file system is then mounted read-only,
the flag will still be present but the rescan operation will not have
been resumed. When we go to umount, btrfs_qgroup_wait_for_completion
will see the flag and interpret it to mean that the rescan worker is
still running and will wait for a completion that will never come.
This patch uses a separate flag to indicate when the worker is
running. The locking and state surrounding the qgroup rescan worker
needs a lot of attention beyond this patch but this is enough to
avoid a hung umount.
Cc: <stable@vger.kernel.org> # v4.4+
Signed-off-by; Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 4a34c9fcc1a7..f5b2a7fb4575 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -2304,6 +2304,7 @@ static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info) | |||
2304 | fs_info->quota_enabled = 0; | 2304 | fs_info->quota_enabled = 0; |
2305 | fs_info->pending_quota_state = 0; | 2305 | fs_info->pending_quota_state = 0; |
2306 | fs_info->qgroup_ulist = NULL; | 2306 | fs_info->qgroup_ulist = NULL; |
2307 | fs_info->qgroup_rescan_running = false; | ||
2307 | mutex_init(&fs_info->qgroup_rescan_lock); | 2308 | mutex_init(&fs_info->qgroup_rescan_lock); |
2308 | } | 2309 | } |
2309 | 2310 | ||