Skip to content

Commit d74f714

Browse files
committed
block: get rid of unused plug->nowait flag
This was introduced to add a plug based way of signaling nowait issues, but we have since moved on from that. Kill the old dead code, nobody is setting it anymore. Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 95848dc commit d74f714

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

block/blk-core.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -722,14 +722,9 @@ void submit_bio_noacct(struct bio *bio)
722722
struct block_device *bdev = bio->bi_bdev;
723723
struct request_queue *q = bdev_get_queue(bdev);
724724
blk_status_t status = BLK_STS_IOERR;
725-
struct blk_plug *plug;
726725

727726
might_sleep();
728727

729-
plug = blk_mq_plug(bio);
730-
if (plug && plug->nowait)
731-
bio->bi_opf |= REQ_NOWAIT;
732-
733728
/*
734729
* For a REQ_NOWAIT based request, return -EOPNOTSUPP
735730
* if queue does not support NOWAIT.
@@ -1059,7 +1054,6 @@ void blk_start_plug_nr_ios(struct blk_plug *plug, unsigned short nr_ios)
10591054
plug->rq_count = 0;
10601055
plug->multiple_queues = false;
10611056
plug->has_elevator = false;
1062-
plug->nowait = false;
10631057
INIT_LIST_HEAD(&plug->cb_list);
10641058

10651059
/*

include/linux/blkdev.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,6 @@ struct blk_plug {
969969

970970
bool multiple_queues;
971971
bool has_elevator;
972-
bool nowait;
973972

974973
struct list_head cb_list; /* md requires an unplug callback */
975974
};

0 commit comments

Comments
 (0)