Commit 31d813a3 authored by Andreas Hindborg's avatar Andreas Hindborg Committed by Jens Axboe
Browse files

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: default avatarAndreas Hindborg <a.hindborg@kernel.org>
Link: https://lore.kernel.org/r/20241220-merge-flag-fix-v1-1-41b7778dac06@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cc76ace4

rust/kernel/block/mq/tag_set.rs

+1 −1
Original line number Diff line number Diff line
@@ -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