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

Commit 7892b5af authored by Miao Xie's avatar Miao Xie Committed by Josef Bacik
Browse files

Btrfs: use common work instead of delayed work 



Since we do not want to delay the async transaction commit, we should
use common work, not delayed work.

Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
parent 7b5a1c53

fs/btrfs/transaction.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1305,13 +1305,13 @@ static void wait_current_trans_commit_start_and_unblock(struct btrfs_root *root, 
struct btrfs_async_commit {

struct btrfs_async_commit {

	struct btrfs_trans_handle *newtrans;

	struct btrfs_trans_handle *newtrans;

	struct btrfs_root *root;

	struct btrfs_root *root;

	struct delayed_work work;

	struct work_struct work;

};

};





static void do_async_commit(struct work_struct *work)

static void do_async_commit(struct work_struct *work)

{

{

	struct btrfs_async_commit *ac =

	struct btrfs_async_commit *ac =

		container_of(work, struct btrfs_async_commit, work.work);

		container_of(work, struct btrfs_async_commit, work);





	/*

	/*

	 * We've got freeze protection passed with the transaction.

	 * We've got freeze protection passed with the transaction.
@@ -1339,7 +1339,7 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans, 
	if (!ac)

	if (!ac)

		return -ENOMEM;

		return -ENOMEM;





	INIT_DELAYED_WORK(&ac->work, do_async_commit);

	INIT_WORK(&ac->work, do_async_commit);

	ac->root = root;

	ac->root = root;

	ac->newtrans = btrfs_join_transaction(root);

	ac->newtrans = btrfs_join_transaction(root);

	if (IS_ERR(ac->newtrans)) {

	if (IS_ERR(ac->newtrans)) {
@@ -1363,7 +1363,7 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans, 
			&root->fs_info->sb->s_writers.lock_map[SB_FREEZE_FS-1],

			&root->fs_info->sb->s_writers.lock_map[SB_FREEZE_FS-1],

			1, _THIS_IP_);

			1, _THIS_IP_);





	schedule_delayed_work(&ac->work, 0);

	schedule_work(&ac->work);





	/* wait for transaction to start and unblock */

	/* wait for transaction to start and unblock */

	if (wait_for_unblock)

	if (wait_for_unblock)