Commit 3d7b5a28 authored by Jan Schmidt's avatar Jan Schmidt Committed by Josef Bacik

Btrfs: automatic rescan after "quota enable" command

When qgroup tracking is enabled, we do an automatic cycle of the new rescan
mechanism.
Signed-off-by: default avatarJan Schmidt <list.btrfs@jan-o-sch.net>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 2f232036
...@@ -1493,10 +1493,14 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans, ...@@ -1493,10 +1493,14 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans,
{ {
struct btrfs_root *quota_root = fs_info->quota_root; struct btrfs_root *quota_root = fs_info->quota_root;
int ret = 0; int ret = 0;
int start_rescan_worker = 0;
if (!quota_root) if (!quota_root)
goto out; 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; fs_info->quota_enabled = fs_info->pending_quota_state;
spin_lock(&fs_info->qgroup_lock); spin_lock(&fs_info->qgroup_lock);
...@@ -1522,6 +1526,13 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans, ...@@ -1522,6 +1526,13 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans,
if (ret) if (ret)
fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; 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: out:
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment