diff options
| author |   Christoph Hellwig <hch@lst.de> | 2022-07-06 09:03:38 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2022-07-06 06:46:25 -0600 |
| commit | 6deacb3bfac2b720e707c566549a7041f17db9c8 (patch) | |
| tree | 54decf2da049481ffceed99c6a50542a0d5eb319 /block/blk-merge.c | |
| parent | block: use bdev_is_zoned instead of open coding it (diff) | |
| download | wireguard-linux-6deacb3bfac2b720e707c566549a7041f17db9c8.tar.xz wireguard-linux-6deacb3bfac2b720e707c566549a7041f17db9c8.zip | |
block: simplify blk_mq_plug
Drop the unused q argument, and invert the check to move the exception
into a branch and the regular path as the normal return.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220706070350.1703384-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 0f5f42ebd0bb..5abf5aa5a5f0 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -1051,7 +1051,7 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, struct blk_plug *plug; struct request *rq; - plug = blk_mq_plug(q, bio); + plug = blk_mq_plug(bio); if (!plug || rq_list_empty(plug->mq_list)) return false; |