1 files changed, 11 insertions, 0 deletions

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index da8458357b57..9d49c586995a 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1493,10 +1493,14 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans,
 {
         struct btrfs_root *quota_root = fs_info->quota_root;
         int ret = 0;
+        int start_rescan_worker = 0;
 
         if (!quota_root)
                 goto out;
 
+        if (!fs_info->quota_enabled && fs_info->pending_quota_state)
+                start_rescan_worker = 1;
+
         fs_info->quota_enabled = fs_info->pending_quota_state;
 
         spin_lock(&fs_info->qgroup_lock);
@@ -1522,6 +1526,13 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans,
         if (ret)
                 fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT;
 
+        if (!ret && start_rescan_worker) {
+                ret = btrfs_qgroup_rescan(fs_info);
+                if (ret)
+                        pr_err("btrfs: start rescan quota failed: %d\n", ret);
+                ret = 0;
+        }
+
 out:
 
         return ret;