diff options
| author | Jens Axboe <axboe@kernel.dk> | 2026-05-27 08:37:52 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2026-05-27 08:37:52 -0600 |
| commit | 640c36aabd80a4bac72dd690e8792efc2f637198 (patch) | |
| tree | 882a1928bf674906140e3ee265b27e40dfa2645b /rust | |
| parent | 072afc5d25354584a9888455c2fb3a8d21bdc754 (diff) | |
| parent | 6235ea3f8b8ffca0333ade0863992f3cd69592ea (diff) | |
| download | linux-next-history-640c36aabd80a4bac72dd690e8792efc2f637198.tar.gz | |
Merge branch 'for-7.2/block' into for-next
* for-7.2/block:
blk-throttle: schedule parent dispatch in tg_flush_bios()
rust: block: mq: align init_request numa_node arg with C signature
block: partitions: replace __get_free_page() with kmalloc()
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/kernel/block/mq/operations.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/kernel/block/mq/operations.rs b/rust/kernel/block/mq/operations.rs index 8ad46129a52c4..861903e18fbfa 100644 --- a/rust/kernel/block/mq/operations.rs +++ b/rust/kernel/block/mq/operations.rs @@ -218,7 +218,7 @@ impl<T: Operations> OperationsVTable<T> { _set: *mut bindings::blk_mq_tag_set, rq: *mut bindings::request, _hctx_idx: crate::ffi::c_uint, - _numa_node: crate::ffi::c_uint, + _numa_node: crate::ffi::c_int, ) -> crate::ffi::c_int { from_result(|| { // SAFETY: By the safety requirements of this function, `rq` points |