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

block: remove the error_sector argument to blkdev_issue_flush 



The argument isn't used by any caller, and drivers don't fill out
bi_sector for flush requests either.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 172ce41d

block/blk-flush.c

+2 −15
Original line number Diff line number Diff line
@@ -432,15 +432,11 @@ 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)

 * @error_sector:	error sector

 *

 * Description:

 *    Issue a flush for the block device in question. Caller can supply

 *    room for storing the error offset in case of a flush error, if they

 *    wish to.

 *    Issue a flush for the block device in question.

 */

int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,

		sector_t *error_sector)

int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask)

{

	struct request_queue *q;

	struct bio *bio;
@@ -458,15 +454,6 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask, 
	bio->bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;



	ret = submit_bio_wait(bio);



	/*

	 * The driver must store the error location in ->bi_sector, if

	 * it supports it. For non-stacked drivers, this should be

	 * copied from blk_rq_pos(rq).

	 */

	if (error_sector)

		*error_sector = bio->bi_iter.bi_sector;



	bio_put(bio);

	return ret;

}

drivers/md/dm-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -2657,7 +2657,7 @@ static void bitmap_flush_work(struct work_struct *work) 


	dm_integrity_flush_buffers(ic);

	if (ic->meta_dev)

		blkdev_issue_flush(ic->dev->bdev, GFP_NOIO, NULL);

		blkdev_issue_flush(ic->dev->bdev, GFP_NOIO);



	limit = ic->provided_data_sectors;

	if (ic->sb->flags & cpu_to_le32(SB_FLAG_RECALCULATING)) {

drivers/md/dm-zoned-metadata.c

+3 −3
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set) 


	ret = dmz_rdwr_block(zmd, REQ_OP_WRITE, block, mblk->page);

	if (ret == 0)

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

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



	return ret;

}
@@ -703,7 +703,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(zmd->dev->bdev, GFP_NOIO, NULL);

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



	return ret;

}
@@ -772,7 +772,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(zmd->dev->bdev, GFP_NOIO, NULL);

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

		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, NULL);

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

out:

	__free_page(page);

	return ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,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, NULL))

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

		return NVME_SC_INTERNAL | NVME_SC_DNR;

	return 0;

}