Commit 25ac8426 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

f2fs: use blkdev_issue_flush in __submit_flush_wait 



Use the blkdev_issue_flush helper instead of duplicating it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Acked-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a587daa0

fs/f2fs/data.c

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ static inline struct bio *__f2fs_bio_alloc(gfp_t gfp_mask, 
	return bio_alloc_bioset(gfp_mask, nr_iovecs, &f2fs_bioset);

}



struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages, bool noio)

static struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages,

		bool noio)

{

	if (noio) {

		/* No failure on bio allocation */

fs/f2fs/f2fs.h

+0 −1
Original line number Diff line number Diff line
@@ -3424,7 +3424,6 @@ void f2fs_destroy_checkpoint_caches(void); 
 */

int __init f2fs_init_bioset(void);

void f2fs_destroy_bioset(void);

struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages, bool noio);

int f2fs_init_bio_entry_cache(void);

void f2fs_destroy_bio_entry_cache(void);

void f2fs_submit_bio(struct f2fs_sb_info *sbi,

fs/f2fs/segment.c

+1 −11
Original line number Diff line number Diff line
@@ -566,17 +566,7 @@ void f2fs_balance_fs_bg(struct f2fs_sb_info *sbi, bool from_bg) 
static int __submit_flush_wait(struct f2fs_sb_info *sbi,

				struct block_device *bdev)

{

	struct bio *bio;

	int ret;



	bio = f2fs_bio_alloc(sbi, 0, false);

	if (!bio)

		return -ENOMEM;



	bio->bi_opf = REQ_OP_WRITE | REQ_SYNC | REQ_PREFLUSH;

	bio_set_dev(bio, bdev);

	ret = submit_bio_wait(bio);

	bio_put(bio);

	int ret = blkdev_issue_flush(bdev);



	trace_f2fs_issue_flush(bdev, test_opt(sbi, NOBARRIER),

				test_opt(sbi, FLUSH_MERGE), ret);