btrfs: move QUOTA_ENABLED check to rescan_should_stop from btrfs_qgroup_rescan_worker
PATCH 1/1 btrfs: move QUOTA_ENABLED check to rescan_should_stop from btrfs_qgroup_rescan_worker
Instead of having 2 places that short circuit the qgroup leaf scan have everything in the qgroup_rescan_leaf function. In addition to that, also ensure that the inconsistent qgroup flag is set when rescan_should_stop returns true. This both retains the old behavior when -EINTR was set in the body of the loop and at the same time also extends this behavior when scanning is interrupted due to remount or unmount operations.
--- fs/btrfs/qgroup.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
fs/btrfs/qgroup.c +6 -7
@@ -3253,7 +3253,8 @@ static int qgroup_rescan_leaf(struct btrfs_trans_handle *trans,static bool rescan_should_stop (struct btrfs_fs_info *fs_info) {return btrfs_fs_closing (fs_info) || -test_bit (BTRFS_FS_STATE_REMOUNTING , &fs_info->fs_state); +test_bit (BTRFS_FS_STATE_REMOUNTING , &fs_info->fs_state) || + !test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags); }static void btrfs_qgroup_rescan_worker (struct btrfs_work *work)
@@ -3283,11 +3284,9 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) err =PTR_ERR (trans);break ; } -if (!test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags)) { - err = -EINTR ; - }else { - err =qgroup_rescan_leaf (trans, path); - } + + err =qgroup_rescan_leaf (trans, path); +if (err >0 )btrfs_commit_transaction (trans);else
@@ -3301,7 +3300,7 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work)if (err >0 && fs_info->qgroup_flags &BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ) { fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; - }else if (err <0 ) { + }else if (err <0 || stopped) { fs_info->qgroup_flags |=BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; }mutex_unlock (&fs_info->qgroup_rescan_lock);
--
2.25.1
Quoted 8 lines · Nikolay Borisov
Instead of having 2 places that short circuit the qgroup leaf scan have everything in the
qgroup_rescan_leaffunction. In addition to that, also ensure that the inconsistent qgroup flag is set whenrescan_should_stopreturns true. This both retains the old behavior when-EINTRwas set in the body of the loop and at the same time also extends this behavior when scanning is interrupted due to remount or unmount operations.Signed-off-by Nikolay Borisov <[email protected]>
Added to misc-next, thanks.