Commit ba13710d authored by Shankari Anand's avatar Shankari Anand Committed by Jens Axboe
Browse files

rust: block: update ARef and AlwaysRefCounted imports from sync::aref 



Update call sites in the block subsystem to import `ARef` and
`AlwaysRefCounted` from `sync::aref` instead of `types`.

This aligns with the ongoing effort to move `ARef` and
`AlwaysRefCounted` to sync.

Suggested-by: default avatarBenno Lossin <lossin@kernel.org>
Link: https://github.com/Rust-for-Linux/linux/issues/1173


Signed-off-by: default avatarShankari Anand <shankari.ak0208@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 55de535e

drivers/block/rnull/rnull.rs

+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
    error::Result,

    pr_info,

    prelude::*,

    sync::Arc,

    types::ARef,

    sync::{aref::ARef, Arc},

};

use pin_init::PinInit;

rust/kernel/block/mq.rs

+2 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
//! The kernel will interface with the block device driver by calling the method

//! implementations of the `Operations` trait.

//!

//! IO requests are passed to the driver as [`kernel::types::ARef<Request>`]

//! IO requests are passed to the driver as [`kernel::sync::aref::ARef<Request>`]

//! instances. The `Request` type is a wrapper around the C `struct request`.

//! The driver must mark end of processing by calling one of the

//! `Request::end`, methods. Failure to do so can lead to deadlock or timeout
@@ -61,8 +61,7 @@ 
//!     block::mq::*,

//!     new_mutex,

//!     prelude::*,

//!     sync::{Arc, Mutex},

//!     types::{ARef, ForeignOwnable},

//!     sync::{aref::ARef, Arc, Mutex},

//! };

//!

//! struct MyBlkDevice;

rust/kernel/block/mq/operations.rs

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
    block::mq::{request::RequestDataWrapper, Request},

    error::{from_result, Result},

    prelude::*,

    sync::Refcount,

    types::{ARef, ForeignOwnable},

    sync::{aref::ARef, Refcount},

    types::ForeignOwnable,

};

use core::marker::PhantomData;

rust/kernel/block/mq/request.rs

+6 −2
Original line number Diff line number Diff line
@@ -8,8 +8,12 @@ 
    bindings,

    block::mq::Operations,

    error::Result,

    sync::{atomic::Relaxed, Refcount},

    types::{ARef, AlwaysRefCounted, Opaque},

    sync::{

        aref::{ARef, AlwaysRefCounted},

        atomic::Relaxed,

        Refcount,

    },

    types::Opaque,

};

use core::{marker::PhantomData, ptr::NonNull};