Skip to content

Commit dbf1ac6

Browse files
authored
Replace the io_uring_register_files_skip function with a constant. (#1268)
Instead of a `const fn`, add a `IO_URING_REGISTER_FILES_SKIP` constant, similar to the `CWD` constant.
1 parent 5f8eaf0 commit dbf1ac6

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/backend/linux_raw/conv.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ pub(super) unsafe fn raw_fd<'a, Num: ArgNumber>(fd: RawFd) -> ArgReg<'a, Num> {
164164
#[cfg(feature = "fs")]
165165
debug_assert!(fd == crate::fs::CWD.as_raw_fd() || fd == crate::fs::ABS.as_raw_fd() || fd >= 0);
166166

167-
// Don't pass the `io_uring_register_files_skip` sentry value this way.
167+
// Don't pass the `IO_URING_REGISTER_FILES_SKIP` sentry value this way.
168168
#[cfg(feature = "io_uring")]
169169
debug_assert_ne!(
170170
fd,
171-
crate::io_uring::io_uring_register_files_skip().as_raw_fd()
171+
crate::io_uring::IO_URING_REGISTER_FILES_SKIP.as_raw_fd()
172172
);
173173

174174
// Linux doesn't look at the high bits beyond the `c_int`, so use

src/io_uring.rs

+5-9
Original file line numberDiff line numberDiff line change
@@ -939,16 +939,12 @@ pub const IORING_OFF_CQ_RING: u64 = sys::IORING_OFF_CQ_RING as _;
939939
pub const IORING_OFF_SQES: u64 = sys::IORING_OFF_SQES as _;
940940

941941
/// `IORING_REGISTER_FILES_SKIP`
942-
#[inline]
943942
#[doc(alias = "IORING_REGISTER_FILES_SKIP")]
944-
pub const fn io_uring_register_files_skip() -> BorrowedFd<'static> {
945-
let files_skip = sys::IORING_REGISTER_FILES_SKIP as RawFd;
946-
947-
// SAFETY: `IORING_REGISTER_FILES_SKIP` is a reserved value that is never
948-
// dynamically allocated, so it'll remain valid for the duration of
949-
// `'static`.
950-
unsafe { BorrowedFd::<'static>::borrow_raw(files_skip) }
951-
}
943+
// SAFETY: `IORING_REGISTER_FILES_SKIP` is a reserved value that is never
944+
// dynamically allocated, so it'll remain valid for the duration of
945+
// `'static`.
946+
pub const IO_URING_REGISTER_FILES_SKIP: BorrowedFd<'static> =
947+
unsafe { BorrowedFd::<'static>::borrow_raw(sys::IORING_REGISTER_FILES_SKIP as RawFd) };
952948

953949
/// `IORING_NOTIF_USAGE_ZC_COPIED` (since Linux 6.2)
954950
pub const IORING_NOTIF_USAGE_ZC_COPIED: i32 = sys::IORING_NOTIF_USAGE_ZC_COPIED as _;

0 commit comments

Comments
 (0)