diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-29 10:23:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-29 10:23:02 -0700 |
| commit | df897265c0c6fc4b758b07f3a756e96b6f2ab81f (patch) | |
| tree | fa265dc2a519552c30b83a91c63c1ddeb110fe58 /rust/kernel/pid_namespace.rs | |
| parent | e571372101522fa91735dac6d30a160b2abe600c (diff) | |
| parent | c37adf34a5dc511e017b5a3bab15fe3171269e46 (diff) | |
Merge tag 'vfs-6.18-rc1.rust' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull vfs rust updates from Christian Brauner:
"This contains a few minor vfs rust changes:
- Add the pid namespace Rust wrappers to the correct MAINTAINERS
entry
- Use to_result() in the Rust file error handling code
- Update imports for fs and pid_namespce Rust wrappers"
* tag 'vfs-6.18-rc1.rust' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
rust: file: use to_result for error handling
pid: add Rust files to MAINTAINERS
rust: fs: update ARef and AlwaysRefCounted imports from sync::aref
rust: pid_namespace: update AlwaysRefCounted imports from sync::aref
Diffstat (limited to 'rust/kernel/pid_namespace.rs')
| -rw-r--r-- | rust/kernel/pid_namespace.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/rust/kernel/pid_namespace.rs b/rust/kernel/pid_namespace.rs index 0e93808e4639..979a9718f153 100644 --- a/rust/kernel/pid_namespace.rs +++ b/rust/kernel/pid_namespace.rs @@ -7,10 +7,7 @@ //! C header: [`include/linux/pid_namespace.h`](srctree/include/linux/pid_namespace.h) and //! [`include/linux/pid.h`](srctree/include/linux/pid.h) -use crate::{ - bindings, - types::{AlwaysRefCounted, Opaque}, -}; +use crate::{bindings, sync::aref::AlwaysRefCounted, types::Opaque}; use core::ptr; /// Wraps the kernel's `struct pid_namespace`. Thread safe. |