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

block: use an on-stack bio in blkdev_issue_flush 



There is no point in allocating memory for a synchronous flush.

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 3175199a

block/blk-flush.c

+6 −11
Original line number Diff line number Diff line
@@ -432,23 +432,18 @@ void blk_insert_flush(struct request *rq) 
/**

 * blkdev_issue_flush - queue a flush

 * @bdev:	blockdev to issue flush for

 * @gfp_mask:	memory allocation flags (for bio_alloc)

 *

 * Description:

 *    Issue a flush for the block device in question.

 */

int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask)

int blkdev_issue_flush(struct block_device *bdev)

{

	struct bio *bio;

	int ret = 0;

	struct bio bio;



	bio = bio_alloc(gfp_mask, 0);

	bio_set_dev(bio, bdev);

	bio->bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;



	ret = submit_bio_wait(bio);

	bio_put(bio);

	return ret;

	bio_init(&bio, NULL, 0);

	bio_set_dev(&bio, bdev);

	bio.bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;

	return submit_bio_wait(&bio);

}

EXPORT_SYMBOL(blkdev_issue_flush);

drivers/md/dm-zoned-metadata.c

+3 −3
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set) 
	ret = dmz_rdwr_block(dev, REQ_OP_WRITE, zmd->sb[set].block,

			     mblk->page);

	if (ret == 0)

		ret = blkdev_issue_flush(dev->bdev, GFP_NOIO);

		ret = blkdev_issue_flush(dev->bdev);



	return ret;

}
@@ -862,7 +862,7 @@ static int dmz_write_dirty_mblocks(struct dmz_metadata *zmd, 


	/* Flush drive cache (this will also sync data) */

	if (ret == 0)

		ret = blkdev_issue_flush(dev->bdev, GFP_NOIO);

		ret = blkdev_issue_flush(dev->bdev);



	return ret;

}
@@ -933,7 +933,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd) 


	/* If there are no dirty metadata blocks, just flush the device cache */

	if (list_empty(&write_list)) {

		ret = blkdev_issue_flush(dev->bdev, GFP_NOIO);

		ret = blkdev_issue_flush(dev->bdev);

		goto err;

	}

drivers/md/raid5-ppl.c

+1 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ static int ppl_recover(struct ppl_log *log, struct ppl_header *pplhdr, 
	}



	/* flush the disk cache after recovery if necessary */

	ret = blkdev_issue_flush(rdev->bdev, GFP_KERNEL);

	ret = blkdev_issue_flush(rdev->bdev);

out:

	__free_page(page);

	return ret;

drivers/nvme/target/io-cmd-bdev.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static void nvmet_bdev_execute_flush(struct nvmet_req *req) 


u16 nvmet_bdev_flush(struct nvmet_req *req)

{

	if (blkdev_issue_flush(req->ns->bdev, GFP_KERNEL))

	if (blkdev_issue_flush(req->ns->bdev))

		return NVME_SC_INTERNAL | NVME_SC_DNR;

	return 0;

}

fs/block_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ int blkdev_fsync(struct file *filp, loff_t start, loff_t end, int datasync) 
	 * i_mutex and doing so causes performance issues with concurrent

	 * O_SYNC writers to a block device.

	 */

	error = blkdev_issue_flush(bdev, GFP_KERNEL);

	error = blkdev_issue_flush(bdev);

	if (error == -EOPNOTSUPP)

		error = 0;