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

block: move ->make_request_fn to struct block_device_operations 



The make_request_fn is a little weird in that it sits directly in
struct request_queue instead of an operation vector.  Replace it with
a block_device_operations method called submit_bio (which describes much
better what it does).  Also remove the request_queue argument to it, as
the queue can be derived pretty trivially from the bio.

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

Documentation/block/biodoc.rst

+1 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ Now the generic block layer performs partition-remapping early and thus 
provides drivers with a sector number relative to whole device, rather than

having to take partition number into account in order to arrive at the true

sector number. The routine blk_partition_remap() is invoked by

generic_make_request even before invoking the queue specific make_request_fn,

generic_make_request even before invoking the queue specific ->submit_bio,

so the i/o scheduler also gets to operate on whole disk sector numbers. This

should typically not require changes to block drivers, it just never gets

to invoke its own partition sector offset calculations since all bios

Documentation/block/writeback_cache_control.rst

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ the Forced Unit Access is implemented. The REQ_PREFLUSH and REQ_FUA flags 
may both be set on a single bio.





Implementation details for make_request_fn based block drivers

Implementation details for bio based block drivers

--------------------------------------------------------------



These drivers will always see the REQ_PREFLUSH and REQ_FUA bits as they sit

arch/m68k/emu/nfblock.c

+3 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct nfhd_device { 
	struct gendisk *disk;

};



static blk_qc_t nfhd_make_request(struct request_queue *queue, struct bio *bio)

static blk_qc_t nfhd_submit_bio(struct bio *bio)

{

	struct nfhd_device *dev = bio->bi_disk->private_data;

	struct bio_vec bvec;
@@ -93,6 +93,7 @@ static int nfhd_getgeo(struct block_device *bdev, struct hd_geometry *geo) 


static const struct block_device_operations nfhd_ops = {

	.owner	= THIS_MODULE,

	.submit_bio = nfhd_submit_bio,

	.getgeo	= nfhd_getgeo,

};
@@ -118,7 +119,7 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize) 
	dev->bsize = bsize;

	dev->bshift = ffs(bsize) - 10;



	dev->queue = blk_alloc_queue(nfhd_make_request, NUMA_NO_NODE);

	dev->queue = blk_alloc_queue(NUMA_NO_NODE);

	if (dev->queue == NULL)

		goto free_dev;

arch/xtensa/platforms/iss/simdisk.c

+3 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void simdisk_transfer(struct simdisk *dev, unsigned long sector, 
	spin_unlock(&dev->lock);

}



static blk_qc_t simdisk_make_request(struct request_queue *q, struct bio *bio)

static blk_qc_t simdisk_submit_bio(struct bio *bio)

{

	struct simdisk *dev = bio->bi_disk->private_data;

	struct bio_vec bvec;
@@ -144,6 +144,7 @@ static void simdisk_release(struct gendisk *disk, fmode_t mode) 


static const struct block_device_operations simdisk_ops = {

	.owner		= THIS_MODULE,

	.submit_bio	= simdisk_submit_bio,

	.open		= simdisk_open,

	.release	= simdisk_release,

};
@@ -267,7 +268,7 @@ static int __init simdisk_setup(struct simdisk *dev, int which, 
	spin_lock_init(&dev->lock);

	dev->users = 0;



	dev->queue = blk_alloc_queue(simdisk_make_request, NUMA_NO_NODE);

	dev->queue = blk_alloc_queue(NUMA_NO_NODE);

	if (dev->queue == NULL) {

		pr_err("blk_alloc_queue failed\n");

		goto out_alloc_queue;

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ static int blkcg_css_online(struct cgroup_subsys_state *css) 
 * blkcg_init_queue - initialize blkcg part of request queue

 * @q: request_queue to initialize

 *

 * Called from __blk_alloc_queue(). Responsible for initializing blkcg

 * Called from blk_alloc_queue(). Responsible for initializing blkcg

 * part of new request_queue @q.

 *

 * RETURNS:

CRA Git | Maintained and supported by SUSTech CRA and CCSE