nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

blk: remove bio_set arg from blk_queue_split()

Browse source 
blk_queue_split() is always called with the last arg being q->bio_split,
where 'q' is the first arg.

Also blk_queue_split() sometimes uses the passed-in 'bs' and sometimes uses
q->bio_split.

This is inconsistent and unnecessary.  Remove the last arg and always use
q->bio_split inside blk_queue_split()

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Credit-to: Javier González <jg@lightnvm.io> (Noticed that lightnvm was missed)
Reviewed-by: Javier González <javier@cnexlabs.com>
Tested-by: Javier González <javier@cnexlabs.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
NeilBrown 2017-06-18 14:38:57 +10:00 committed by Jens Axboe
parent e4cdf1a1cb
commit af67c31fba
14 changed files with 18 additions and 20 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
block/blk-core.c
View file

@ -1723,7 +1723,7 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio)
*/ */
blk_queue_bounce(q, &bio); blk_queue_bounce(q, &bio);
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) { if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
bio->bi_status = BLK_STS_IOERR; bio->bi_status = BLK_STS_IOERR;

9
block/blk-merge.c
View file

@ -202,8 +202,7 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
return do_split ? new : NULL; return do_split ? new : NULL;
} }
void blk_queue_split(struct request_queue *q, struct bio **bio, void blk_queue_split(struct request_queue *q, struct bio **bio)
struct bio_set *bs)
{ {
struct bio *split, *res; struct bio *split, *res;
unsigned nsegs; unsigned nsegs;
@ -211,13 +210,13 @@ void blk_queue_split(struct request_queue *q, struct bio **bio,
switch (bio_op(*bio)) { switch (bio_op(*bio)) {
case REQ_OP_DISCARD: case REQ_OP_DISCARD:
case REQ_OP_SECURE_ERASE: case REQ_OP_SECURE_ERASE:
split = blk_bio_discard_split(q, *bio, bs, &nsegs); split = blk_bio_discard_split(q, *bio, q->bio_split, &nsegs);
break; break;
case REQ_OP_WRITE_ZEROES: case REQ_OP_WRITE_ZEROES:
split = blk_bio_write_zeroes_split(q, *bio, bs, &nsegs); split = blk_bio_write_zeroes_split(q, *bio, q->bio_split, &nsegs);
break; break;
case REQ_OP_WRITE_SAME: case REQ_OP_WRITE_SAME:
split = blk_bio_write_same_split(q, *bio, bs, &nsegs); split = blk_bio_write_same_split(q, *bio, q->bio_split, &nsegs);
break; break;
default: default:
split = blk_bio_segment_split(q, *bio, q->bio_split, &nsegs); split = blk_bio_segment_split(q, *bio, q->bio_split, &nsegs);

2
block/blk-mq.c
View file

@ -1499,7 +1499,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
blk_queue_bounce(q, &bio); blk_queue_bounce(q, &bio);
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) { if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
bio_io_error(bio); bio_io_error(bio);

2
drivers/block/drbd/drbd_req.c
View file

@ -1560,7 +1560,7 @@ blk_qc_t drbd_make_request(struct request_queue *q, struct bio *bio)
struct drbd_device *device = (struct drbd_device *) q->queuedata; struct drbd_device *device = (struct drbd_device *) q->queuedata;
unsigned long start_jif; unsigned long start_jif;
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
start_jif = jiffies; start_jif = jiffies;

2
drivers/block/pktcdvd.c
View file

@ -2414,7 +2414,7 @@ static blk_qc_t pkt_make_request(struct request_queue *q, struct bio *bio)
blk_queue_bounce(q, &bio); blk_queue_bounce(q, &bio);
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
pd = q->queuedata; pd = q->queuedata;
if (!pd) { if (!pd) {

2
drivers/block/ps3vram.c
View file

@ -606,7 +606,7 @@ static blk_qc_t ps3vram_make_request(struct request_queue *q, struct bio *bio)
dev_dbg(&dev->core, "%s\n", __func__); dev_dbg(&dev->core, "%s\n", __func__);
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
spin_lock_irq(&priv->lock); spin_lock_irq(&priv->lock);
busy = !bio_list_empty(&priv->list); busy = !bio_list_empty(&priv->list);

2
drivers/block/rsxx/dev.c
View file

@ -151,7 +151,7 @@ static blk_qc_t rsxx_make_request(struct request_queue *q, struct bio *bio)
struct rsxx_bio_meta *bio_meta; struct rsxx_bio_meta *bio_meta;
blk_status_t st = BLK_STS_IOERR; blk_status_t st = BLK_STS_IOERR;
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
might_sleep(); might_sleep();

2
drivers/block/umem.c
View file

@ -529,7 +529,7 @@ static blk_qc_t mm_make_request(struct request_queue *q, struct bio *bio)
(unsigned long long)bio->bi_iter.bi_sector, (unsigned long long)bio->bi_iter.bi_sector,
bio->bi_iter.bi_size); bio->bi_iter.bi_size);
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
spin_lock_irq(&card->lock); spin_lock_irq(&card->lock);
*card->biotail = bio; *card->biotail = bio;

4
drivers/lightnvm/pblk-init.c
View file

@ -33,7 +33,7 @@ static int pblk_rw_io(struct request_queue *q, struct pblk *pblk,
* constraint. Writes can be of arbitrary size. * constraint. Writes can be of arbitrary size.
*/ */
if (bio_data_dir(bio) == READ) { if (bio_data_dir(bio) == READ) {
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
ret = pblk_submit_read(pblk, bio); ret = pblk_submit_read(pblk, bio);
if (ret == NVM_IO_DONE && bio_flagged(bio, BIO_CLONED)) if (ret == NVM_IO_DONE && bio_flagged(bio, BIO_CLONED))
bio_put(bio); bio_put(bio);
@ -46,7 +46,7 @@ static int pblk_rw_io(struct request_queue *q, struct pblk *pblk,
* available for user I/O. * available for user I/O.
*/ */
if (unlikely(pblk_get_secs(bio) >= pblk_rl_sysfs_rate_show(&pblk->rl))) if (unlikely(pblk_get_secs(bio) >= pblk_rl_sysfs_rate_show(&pblk->rl)))
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
return pblk_write_to_cache(pblk, bio, PBLK_IOTYPE_USER); return pblk_write_to_cache(pblk, bio, PBLK_IOTYPE_USER);
} }

2
drivers/lightnvm/rrpc.c
View file

@ -994,7 +994,7 @@ static blk_qc_t rrpc_make_rq(struct request_queue *q, struct bio *bio)
struct nvm_rq *rqd; struct nvm_rq *rqd;
int err; int err;
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
if (bio_op(bio) == REQ_OP_DISCARD) { if (bio_op(bio) == REQ_OP_DISCARD) {
rrpc_discard(rrpc, bio); rrpc_discard(rrpc, bio);

2
drivers/md/md.c
View file

@ -265,7 +265,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)
unsigned int sectors; unsigned int sectors;
int cpu; int cpu;
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
if (mddev == NULL || mddev->pers == NULL) { if (mddev == NULL || mddev->pers == NULL) {
bio_io_error(bio); bio_io_error(bio);

2
drivers/s390/block/dcssblk.c
View file

@ -845,7 +845,7 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
unsigned long source_addr; unsigned long source_addr;
unsigned long bytes_done; unsigned long bytes_done;
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
bytes_done = 0; bytes_done = 0;
dev_info = bio->bi_bdev->bd_disk->private_data; dev_info = bio->bi_bdev->bd_disk->private_data;

2
drivers/s390/block/xpram.c
View file

@ -190,7 +190,7 @@ static blk_qc_t xpram_make_request(struct request_queue *q, struct bio *bio)
unsigned long page_addr; unsigned long page_addr;
unsigned long bytes; unsigned long bytes;
blk_queue_split(q, &bio, q->bio_split); blk_queue_split(q, &bio);
if ((bio->bi_iter.bi_sector & 7) != 0 || if ((bio->bi_iter.bi_sector & 7) != 0 ||
(bio->bi_iter.bi_size & 4095) != 0) (bio->bi_iter.bi_size & 4095) != 0)

3
include/linux/blkdev.h
View file

@ -944,8 +944,7 @@ extern blk_status_t blk_insert_cloned_request(struct request_queue *q,
struct request *rq); struct request *rq);
extern int blk_rq_append_bio(struct request *rq, struct bio *bio); extern int blk_rq_append_bio(struct request *rq, struct bio *bio);
extern void blk_delay_queue(struct request_queue *, unsigned long); extern void blk_delay_queue(struct request_queue *, unsigned long);
extern void blk_queue_split(struct request_queue *, struct bio **, extern void blk_queue_split(struct request_queue *, struct bio **);
struct bio_set *);
extern void blk_recount_segments(struct request_queue *, struct bio *); extern void blk_recount_segments(struct request_queue *, struct bio *);
extern int scsi_verify_blk_ioctl(struct block_device *, unsigned int); extern int scsi_verify_blk_ioctl(struct block_device *, unsigned int);
extern int scsi_cmd_blk_ioctl(struct block_device *, fmode_t, extern int scsi_cmd_blk_ioctl(struct block_device *, fmode_t,