Skip to content

Commit 90513bc

Browse files
authored
Fix the return type of fsmount. (#962)
The documentation for `fsmount` says that it returns an owned file descriptor. Fixes #959.
1 parent c2e1182 commit 90513bc

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/backend/libc/mount/syscalls.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ pub(crate) fn fsmount(
5050
fs_fd: BorrowedFd<'_>,
5151
flags: super::types::FsMountFlags,
5252
attr_flags: super::types::MountAttrFlags,
53-
) -> io::Result<()> {
53+
) -> io::Result<OwnedFd> {
5454
syscall! {
5555
fn fsmount(
5656
fs_fd: c::c_int,
5757
flags: c::c_uint,
5858
attr_flags: c::c_uint
5959
) via SYS_fsmount -> c::c_int
6060
}
61-
unsafe { ret(fsmount(borrowed_fd(fs_fd), flags.bits(), attr_flags.bits())) }
61+
unsafe { ret_owned_fd(fsmount(borrowed_fd(fs_fd), flags.bits(), attr_flags.bits())) }
6262
}
6363

6464
#[cfg(linux_kernel)]

src/backend/linux_raw/mount/syscalls.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ pub(crate) fn fsmount(
5151
fs_fd: BorrowedFd<'_>,
5252
flags: super::types::FsMountFlags,
5353
attr_flags: super::types::MountAttrFlags,
54-
) -> io::Result<()> {
55-
unsafe { ret(syscall_readonly!(__NR_fsmount, fs_fd, flags, attr_flags)) }
54+
) -> io::Result<OwnedFd> {
55+
unsafe { ret_owned_fd(syscall_readonly!(__NR_fsmount, fs_fd, flags, attr_flags)) }
5656
}
5757

5858
#[cfg(feature = "mount")]

src/mount/fsopen.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub fn fsmount(
2828
fs_fd: BorrowedFd<'_>,
2929
flags: FsMountFlags,
3030
attr_flags: MountAttrFlags,
31-
) -> io::Result<()> {
31+
) -> io::Result<OwnedFd> {
3232
backend::mount::syscalls::fsmount(fs_fd, flags, attr_flags)
3333
}
3434

0 commit comments

Comments
 (0)