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

Commit 3e3d900f authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: introduce __wait_one_discard_bio 



commit 2a510c005c9d3fafbaae1a6d27da8256c95542f9 upstream.

In order to avoid copied codes.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 22bf28fc

fs/f2fs/segment.c

+17 −16
Original line number Diff line number Diff line
@@ -1074,6 +1074,20 @@ out: 
	mutex_unlock(&dcc->cmd_lock);

}



static void __wait_one_discard_bio(struct f2fs_sb_info *sbi,

							struct discard_cmd *dc)

{

	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;



	wait_for_completion_io(&dc->wait);

	mutex_lock(&dcc->cmd_lock);

	f2fs_bug_on(sbi, dc->state != D_DONE);

	dc->ref--;

	if (!dc->ref)

		__remove_discard_cmd(sbi, dc);

	mutex_unlock(&dcc->cmd_lock);

}



static void __wait_discard_cmd(struct f2fs_sb_info *sbi, bool wait_cond)

{

	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
@@ -1098,13 +1112,7 @@ next: 
	mutex_unlock(&dcc->cmd_lock);



	if (need_wait) {

		wait_for_completion_io(&dc->wait);

		mutex_lock(&dcc->cmd_lock);

		f2fs_bug_on(sbi, dc->state != D_DONE);

		dc->ref--;

		if (!dc->ref)

			__remove_discard_cmd(sbi, dc);

		mutex_unlock(&dcc->cmd_lock);

		__wait_one_discard_bio(sbi, dc);

		goto next;

	}

}
@@ -1128,15 +1136,8 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr) 
	}

	mutex_unlock(&dcc->cmd_lock);



	if (need_wait) {

		wait_for_completion_io(&dc->wait);

		mutex_lock(&dcc->cmd_lock);

		f2fs_bug_on(sbi, dc->state != D_DONE);

		dc->ref--;

		if (!dc->ref)

			__remove_discard_cmd(sbi, dc);

		mutex_unlock(&dcc->cmd_lock);

	}

	if (need_wait)

		__wait_one_discard_bio(sbi, dc);

}



/* This comes from f2fs_put_super */