summaryrefslogtreecommitdiff
path: root/rust/kernel/fs
diff options
context:
space:
mode:
authorBenjamin Tissoires <bentiss@kernel.org>2025-09-30 16:31:10 +0200
committerBenjamin Tissoires <bentiss@kernel.org>2025-09-30 16:31:10 +0200
commitd325efac5938efa3c2a25df72a1bd1af16cd0ed8 (patch)
tree6bb0db4f21bd6359bb32f3beeb63231477b09ef3 /rust/kernel/fs
parentbba920e6f803138587248079de47ad3464a396f6 (diff)
parentd1dd75c6500c74b91c5286fd3277710371d3e3ca (diff)
Merge branch 'for-6.18/core' into for-linus
- allow HID-BPF to rebind a driver to hid-multitouch (Benjamin Tissoires) - Change hid_driver to use a const char* for .name (Rahul Rameshbabu)
Diffstat (limited to 'rust/kernel/fs')
-rw-r--r--rust/kernel/fs/file.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/kernel/fs/file.rs b/rust/kernel/fs/file.rs
index 72d84fb0e266..35fd5db35c46 100644
--- a/rust/kernel/fs/file.rs
+++ b/rust/kernel/fs/file.rs
@@ -366,7 +366,7 @@ impl core::ops::Deref for File {
//
// By the type invariants, there are no `fdget_pos` calls that did not take the
// `f_pos_lock` mutex.
- unsafe { LocalFile::from_raw_file(self as *const File as *const bindings::file) }
+ unsafe { LocalFile::from_raw_file(core::ptr::from_ref(self).cast()) }
}
}