Re: [PATCH v4 15/16] rust: block: refactor to use `&raw [const|mut]`
From: Boqun Feng
Date: Mon Mar 17 2025 - 00:04:54 EST
On Sun, Mar 16, 2025 at 02:14:24AM -0400, Antonio Hickey wrote:
> Replacing all occurrences of `addr_of!(place)` and `addr_of_mut!(place)`
> with `&raw const place` and `&raw mut place` respectively.
>
> This will allow us to reduce macro complexity, and improve consistency
> with existing reference syntax as `&raw const`, `&raw mut` are similar
> to `&`, `&mut` making it fit more naturally with other existing code.
>
> Suggested-by: Benno Lossin <benno.lossin@xxxxxxxxx>
> Link: https://github.com/Rust-for-Linux/linux/issues/1148
> Signed-off-by: Antonio Hickey <contact@xxxxxxxxxxxxxxxxx>
Reviewed-by: Boqun Feng <boqun.feng@xxxxxxxxx>
Regards,
Boqun
> ---
> rust/kernel/block/mq/request.rs | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rust/kernel/block/mq/request.rs b/rust/kernel/block/mq/request.rs
> index 7943f43b9575..4a5b7ec914ef 100644
> --- a/rust/kernel/block/mq/request.rs
> +++ b/rust/kernel/block/mq/request.rs
> @@ -12,7 +12,7 @@
> };
> use core::{
> marker::PhantomData,
> - ptr::{addr_of_mut, NonNull},
> + ptr::NonNull,
> sync::atomic::{AtomicU64, Ordering},
> };
>
> @@ -187,7 +187,7 @@ pub(crate) fn refcount(&self) -> &AtomicU64 {
> pub(crate) unsafe fn refcount_ptr(this: *mut Self) -> *mut AtomicU64 {
> // SAFETY: Because of the safety requirements of this function, the
> // field projection is safe.
> - unsafe { addr_of_mut!((*this).refcount) }
> + unsafe { &raw mut (*this).refcount }
> }
> }
>
> --
> 2.48.1
>