1 files changed, 3 insertions, 0 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 640598c0d0e7..974be09e7556 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3780,6 +3780,9 @@ void close_ctree(struct btrfs_root *root)
         fs_info->closing = 1;
         smp_mb();
 
+        /* wait for the qgroup rescan worker to stop */
+        btrfs_qgroup_wait_for_completion(fs_info);
+
         /* wait for the uuid_scan task to finish */
         down(&fs_info->uuid_tree_rescan_sem);
         /* avoid complains from lockdep et al., set sem back to initial state */