Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 787138e4 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Greg Kroah-Hartman
Browse files

btrfs: move QUOTA_ENABLED check to rescan_should_stop from btrfs_qgroup_rescan_worker 



[ Upstream commit db5df254120004471e1c957957ab2f1e612dcbd6 ]

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.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Stable-dep-of: f7e942b5bb35 ("btrfs: qgroup: fix sleep from invalid context bug in btrfs_qgroup_inherit()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 255289ad

fs/btrfs/qgroup.c

+6 −7
Original line number Diff line number Diff line
@@ -3203,7 +3203,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)
@@ -3233,11 +3234,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);

		}



		if (err > 0)

			btrfs_commit_transaction(trans);

		else
@@ -3251,7 +3250,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);