diff options
| author | Aleksa Sarai <asarai@suse.de> | 2017-07-04 21:49:06 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-13 14:03:47 -0700 |
| commit | b66950d5233bd4f4fce13e270b873bd893af7fe9 (patch) | |
| tree | fb92b6c08f3b8f8266044183f97424a1a055f833 /fs/btrfs/super.c | |
| parent | 19011e6ac194ef3feb014f9f61bc1123b1eeab7d (diff) | |
| download | linux-stable-b66950d5233bd4f4fce13e270b873bd893af7fe9.tar.gz linux-stable-b66950d5233bd4f4fce13e270b873bd893af7fe9.tar.bz2 linux-stable-b66950d5233bd4f4fce13e270b873bd893af7fe9.zip | |
btrfs: resume qgroup rescan on rw remount
commit 6c6b5a39c4bf3dbd8cf629c9f5450e983c19dbb9 upstream.
Several distributions mount the "proper root" as ro during initrd and
then remount it as rw before pivot_root(2). Thus, if a rescan had been
aborted by a previous shutdown, the rescan would never be resumed.
This issue would manifest itself as several btrfs ioctl(2)s causing the
entire machine to hang when btrfs_qgroup_wait_for_completion was hit
(due to the fs_info->qgroup_rescan_running flag being set but the rescan
itself not being resumed). Notably, Docker's btrfs storage driver makes
regular use of BTRFS_QUOTA_CTL_DISABLE and BTRFS_IOC_QUOTA_RESCAN_WAIT
(causing this problem to be manifested on boot for some machines).
Cc: Jeff Mahoney <jeffm@suse.com>
Fixes: b382a324b60f ("Btrfs: fix qgroup rescan resume on mount")
Signed-off-by: Aleksa Sarai <asarai@suse.de>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Tested-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index cf6d11bb8dcb..2340c1f798a3 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1575,6 +1575,8 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) goto restore; } + btrfs_qgroup_rescan_resume(fs_info); + if (!fs_info->uuid_root) { btrfs_info(fs_info, "creating UUID tree"); ret = btrfs_create_uuid_tree(fs_info); |