diff options
author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-06-20 11:15:41 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-06-20 19:27:14 -0600 |
commit | ca18d6f769d22e931d3ba1e8d1ae81953547a417 (patch) | |
tree | 9ef36b3c1ca48caccbe907d0985a61bd6c86c420 /drivers/scsi/osd/osd_initiator.c | |
parent | d280bab305431c1836423f3cd6a5ff0e35a601ef (diff) | |
download | linux-stable-ca18d6f769d22e931d3ba1e8d1ae81953547a417.tar.gz linux-stable-ca18d6f769d22e931d3ba1e8d1ae81953547a417.tar.bz2 linux-stable-ca18d6f769d22e931d3ba1e8d1ae81953547a417.zip |
block: Make most scsi_req_init() calls implicit
Instead of explicitly calling scsi_req_init() after blk_get_request(),
call that function from inside blk_get_request(). Add an
.initialize_rq_fn() callback function to the block drivers that need
it. Merge the IDE .init_rq_fn() function into .initialize_rq_fn()
because it is too small to keep it as a separate function. Keep the
scsi_req_init() call in ide_prep_sense() because it follows a
blk_rq_init() call.
References: commit 82ed4db499b8 ("block: split scsi_request out of struct request")
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Omar Sandoval <osandov@fb.com>
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/scsi/osd/osd_initiator.c')
-rw-r--r-- | drivers/scsi/osd/osd_initiator.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c index 1e69a43b279d..ca45bf6d2bdb 100644 --- a/drivers/scsi/osd/osd_initiator.c +++ b/drivers/scsi/osd/osd_initiator.c @@ -1574,7 +1574,6 @@ static struct request *_make_request(struct request_queue *q, bool has_write, flags); if (IS_ERR(req)) return req; - scsi_req_init(req); for_each_bio(bio) { struct bio *bounce_bio = bio; @@ -1619,7 +1618,6 @@ static int _init_blk_request(struct osd_request *or, ret = PTR_ERR(req); goto out; } - scsi_req_init(req); or->in.req = or->request->next_rq = req; } } else if (has_in) |