From: Andreas Hindborg <a.hindborg@kernel.org>
Date: Fri, 20 Dec 2024 09:37:57 +0000 (+0100)
Subject: rust: block: fix use of BLK_MQ_F_SHOULD_MERGE
X-Git-Tag: v6.14-rc1~202^2~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31d813a3b8cbde2d09ba4dee282ca29096541006;p=thirdparty%2Fkernel%2Flinux.git

rust: block: fix use of BLK_MQ_F_SHOULD_MERGE

BLK_MQ_F_SHOULD_MERGE has was removed [1] and is now in effect by default.
So remove the flag from tag sets of Rust block device drivers.

Link: https://lore.kernel.org/r/20241219060214.1928848-1-hch@lst.de [1]
Fixes: 9377b95cda73 ("block: remove BLK_MQ_F_SHOULD_MERGE")
Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
Link: https://lore.kernel.org/r/20241220-merge-flag-fix-v1-1-41b7778dac06@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/rust/kernel/block/mq/tag_set.rs b/rust/kernel/block/mq/tag_set.rs
index d7f175a05d992..00ddcc71dfa2a 100644
--- a/rust/kernel/block/mq/tag_set.rs
+++ b/rust/kernel/block/mq/tag_set.rs
@@ -52,7 +52,7 @@ impl<T: Operations> TagSet<T> {
                     numa_node: bindings::NUMA_NO_NODE,
                     queue_depth: num_tags,
                     cmd_size,
-                    flags: bindings::BLK_MQ_F_SHOULD_MERGE,
+                    flags: 0,
                     driver_data: core::ptr::null_mut::<crate::ffi::c_void>(),
                     nr_maps: num_maps,
                     ..tag_set