summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-07-22 21:05:15 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-07-22 21:05:15 +0300
commitf036d67c02b6f6966b0d45e9a16c9f2e7ede80a3 (patch)
tree5b8183940408ed9b79203a9055f1389422ce1050 /include/linux
parentbdd1d82e7d02bd2764a68a5cc54533dfc2ba452a (diff)
parentbb5faa99f0ce40756ab7bbbce4f16c01ca5ebd5a (diff)
downloadlinux-f036d67c02b6f6966b0d45e9a16c9f2e7ede80a3.tar.xz
Merge tag 'block-6.5-2023-07-21' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe: - Fix for loop regressions (Mauricio) - Fix a potential stall with batched wakeups in sbitmap (David) - Fix for stall with recursive plug flushes (Ross) - Skip accounting of empty requests for blk-iocost (Chengming) - Remove a dead field in struct blk_mq_hw_ctx (Chengming) * tag 'block-6.5-2023-07-21' of git://git.kernel.dk/linux: loop: do not enforce max_loop hard limit by (new) default loop: deprecate autoloading callback loop_probe() sbitmap: fix batching wakeup blk-iocost: skip empty flush bio in iocost blk-mq: delete dead struct blk_mq_hw_ctx->queued field blk-mq: Fix stall due to recursive flush plug
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blk-mq.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index b96e00499f9e..495ca198775f 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -397,8 +397,6 @@ struct blk_mq_hw_ctx {
*/
struct blk_mq_tags *sched_tags;
- /** @queued: Number of queued requests. */
- unsigned long queued;
/** @run: Number of dispatched requests. */
unsigned long run;