[PATCH 15/20] block: remove the nr_sectors variable in generic_make_request_checks
From: Christoph Hellwig <hch@lst.de>
Date: 2020-07-01 09:00:54
Also in:
dm-devel, linux-bcache, linux-m68k, linux-nvme, linux-s390, linuxppc-dev, lkml, nvdimm
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
The variable is only used once, so just open code the bio_sector() there. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 37435d0d433564..28f60985dc75cc 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c@@ -974,7 +974,6 @@ static noinline_for_stack bool generic_make_request_checks(struct bio *bio) { struct request_queue *q = bio->bi_disk->queue; - int nr_sectors = bio_sectors(bio); blk_status_t status = BLK_STS_IOERR; might_sleep();
@@ -1007,7 +1006,7 @@ generic_make_request_checks(struct bio *bio) if (op_is_flush(bio->bi_opf) && !test_bit(QUEUE_FLAG_WC, &q->queue_flags)) { bio->bi_opf &= ~(REQ_PREFLUSH | REQ_FUA); - if (!nr_sectors) { + if (!bio_sectors(bio)) { status = BLK_STS_OK; goto end_io; }
--
2.26.2