diff options
| author | Christoph Hellwig <[email protected]> | 2024-12-19 06:01:59 +0000 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2024-12-23 15:17:23 +0000 |
| commit | cc76ace465d6977b47daa427379b7be1e0976f12 (patch) | |
| tree | cdb182508f10e4a4e157238e8f72645615c7c65f /drivers/mmc/core/queue.c | |
| parent | blk-mq: remove unused queue mapping helpers (diff) | |
| download | kernel-cc76ace465d6977b47daa427379b7be1e0976f12.tar.gz kernel-cc76ace465d6977b47daa427379b7be1e0976f12.zip | |
block: remove BLK_MQ_F_SHOULD_MERGE
BLK_MQ_F_SHOULD_MERGE is set for all tag_sets except those that purely
process passthrough commands (bsg-lib, ufs tmf, various nvme admin
queues) and thus don't even check the flag. Remove it to simplify the
driver interface.
Signed-off-by: Christoph Hellwig <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
Diffstat (limited to 'drivers/mmc/core/queue.c')
| -rw-r--r-- | drivers/mmc/core/queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index 4d6844261912..ab662f502fe7 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -441,7 +441,7 @@ struct gendisk *mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, else mq->tag_set.queue_depth = MMC_QUEUE_DEPTH; mq->tag_set.numa_node = NUMA_NO_NODE; - mq->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_BLOCKING; + mq->tag_set.flags = BLK_MQ_F_BLOCKING; mq->tag_set.nr_hw_queues = 1; mq->tag_set.cmd_size = sizeof(struct mmc_queue_req); mq->tag_set.driver_data = mq; |