diff mbox series

rust: block: fix use of BLK_MQ_F_SHOULD_MERGE

Message ID 20241220-merge-flag-fix-v1-1-41b7778dac06@kernel.org (mailing list archive)
State New
Headers show
Series rust: block: fix use of BLK_MQ_F_SHOULD_MERGE | expand

Commit Message

Andreas Hindborg Dec. 20, 2024, 9:37 a.m. UTC 
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>
---
 rust/kernel/block/mq/tag_set.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


---
base-commit: 3af068412d79f2e1b8c394cde2a54ce84c8df143
change-id: 20241220-merge-flag-fix-2eadb91aa653

Best regards,

Comments

Jens Axboe Dec. 20, 2024, 2:22 p.m. UTC | #1 
On Fri, 20 Dec 2024 10:37:57 +0100, Andreas Hindborg wrote:
> 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.
> 
> 

Applied, thanks!

[1/1] rust: block: fix use of BLK_MQ_F_SHOULD_MERGE
      commit: 67489f4bfb02cb86751f168bb57af250f21cd1ad

Best regards,
diff mbox series

Patch

diff --git a/rust/kernel/block/mq/tag_set.rs b/rust/kernel/block/mq/tag_set.rs
index d7f175a05d992b95c0a65522fbb2b8e08a9276d2..00ddcc71dfa2a1da28d66c542b554196461bea33 100644
--- a/rust/kernel/block/mq/tag_set.rs
+++ b/rust/kernel/block/mq/tag_set.rs
@@ -52,7 +52,7 @@  pub fn new(
                     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