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

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

f2fs: introduce f2fs_wait_discard_bios 



Split f2fs_wait_discard_bios from f2fs_wait_discard_bio, just for cleanup,
no logic change.

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

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2193,7 +2193,7 @@ void destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free); 
void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr);

bool is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr);

void refresh_sit_entry(struct f2fs_sb_info *sbi, block_t old, block_t new);

void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr);

void f2fs_wait_discard_bios(struct f2fs_sb_info *sbi);

void clear_prefree_segments(struct f2fs_sb_info *sbi, struct cp_control *cpc);

void release_discard_addrs(struct f2fs_sb_info *sbi);

int npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra);

fs/f2fs/segment.c

+22 −15
Original line number Diff line number Diff line
@@ -797,13 +797,9 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr) 
	struct list_head *pend_list = &(dcc->discard_pend_list);

	struct list_head *wait_list = &(dcc->discard_wait_list);

	struct discard_cmd *dc, *tmp;

	struct blk_plug plug;



	mutex_lock(&dcc->cmd_lock);



	if (blkaddr == NULL_ADDR)

		goto release_discard;



	list_for_each_entry_safe(dc, tmp, pend_list, list) {

		if (dc->lstart <= blkaddr && blkaddr < dc->lstart + dc->len)

			__punch_discard_cmd(sbi, dc, blkaddr);
@@ -817,9 +813,20 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr) 
		}

	}



release_discard:

	/* this comes from f2fs_put_super */

	if (blkaddr == NULL_ADDR) {

	mutex_unlock(&dcc->cmd_lock);

}



/* This comes from f2fs_put_super */

void f2fs_wait_discard_bios(struct f2fs_sb_info *sbi)

{

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

	struct list_head *pend_list = &(dcc->discard_pend_list);

	struct list_head *wait_list = &(dcc->discard_wait_list);

	struct discard_cmd *dc, *tmp;

	struct blk_plug plug;



	mutex_lock(&dcc->cmd_lock);



	blk_start_plug(&plug);

	list_for_each_entry_safe(dc, tmp, pend_list, list)

		__submit_discard_cmd(sbi, dc);
@@ -829,7 +836,7 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr) 
		wait_for_completion_io(&dc->wait);

		__remove_discard_cmd(sbi, dc);

	}

	}



	mutex_unlock(&dcc->cmd_lock);

}

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ static void f2fs_put_super(struct super_block *sb) 
	}



	/* be sure to wait for any on-going discard commands */

	f2fs_wait_discard_bio(sbi, NULL_ADDR);

	f2fs_wait_discard_bios(sbi);



	/* write_checkpoint can update stat informaion */

	f2fs_destroy_stats(sbi);