calls: Update params in mount()

XuShaohua · Aug 3, 2024 · 08ec319 · 08ec319
1 parent 315f40e
commit 08ec319
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 61 deletions.
diff --git a/examples/mount.rs b/examples/mount.rs
@@ -10,7 +10,7 @@ fn main() {
     let src_dir = "/etc";
     let fs_type = "";
     let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-    let data = 0;
+    let data = std::ptr::null_mut();
     let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
     assert!(ret.is_ok());
     let flags = 0;

diff --git a/src/calls/mount_linux.rs b/src/calls/mount_linux.rs
@@ -10,7 +10,7 @@
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));
@@ -22,22 +22,24 @@ pub unsafe fn mount<P: AsRef<Path>>(
     dev_name: P,
     dir_name: P,
     fs_type: P,
-    flags: usize,
-    data: usize,
+    flags: u32,
+    data_page: *mut core::ffi::c_void,
 ) -> Result<(), Errno> {
     let dev_name = CString::new(dev_name.as_ref());
     let dev_name_ptr = dev_name.as_ptr() as usize;
     let dir_name = CString::new(dir_name.as_ref());
     let dir_name_ptr = dir_name.as_ptr() as usize;
     let fs_type = CString::new(fs_type.as_ref());
     let fs_type_ptr = fs_type.as_ptr() as usize;
+    let flags = flags as usize;
+    let data_page = data_page as usize;
     syscall5(
         SYS_MOUNT,
         dev_name_ptr,
         dir_name_ptr,
         fs_type_ptr,
         flags,
-        data,
+        data_page,
     )
     .map(drop)
 }
diff --git a/src/calls/umount.rs b/src/calls/umount.rs
@@ -10,7 +10,7 @@
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));

diff --git a/src/calls/umount2.rs b/src/calls/umount2.rs
@@ -10,7 +10,7 @@
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));

diff --git a/src/platform/linux-aarch64/call.rs b/src/platform/linux-aarch64/call.rs
@@ -4006,7 +4006,7 @@ pub unsafe fn mmap(
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));
@@ -4018,22 +4018,24 @@ pub unsafe fn mount<P: AsRef<Path>>(
     dev_name: P,
     dir_name: P,
     fs_type: P,
-    flags: usize,
-    data: usize,
+    flags: u32,
+    data_page: *mut core::ffi::c_void,
 ) -> Result<(), Errno> {
     let dev_name = CString::new(dev_name.as_ref());
     let dev_name_ptr = dev_name.as_ptr() as usize;
     let dir_name = CString::new(dir_name.as_ref());
     let dir_name_ptr = dir_name.as_ptr() as usize;
     let fs_type = CString::new(fs_type.as_ref());
     let fs_type_ptr = fs_type.as_ptr() as usize;
+    let flags = flags as usize;
+    let data_page = data_page as usize;
     syscall5(
         SYS_MOUNT,
         dev_name_ptr,
         dir_name_ptr,
         fs_type_ptr,
         flags,
-        data,
+        data_page,
     )
     .map(drop)
 }
@@ -8722,7 +8724,7 @@ pub unsafe fn umask(mode: mode_t) -> Result<mode_t, Errno> {
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));

diff --git a/src/platform/linux-arm/call.rs b/src/platform/linux-arm/call.rs
@@ -4568,7 +4568,7 @@ pub unsafe fn mmap2(
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));
@@ -4580,22 +4580,24 @@ pub unsafe fn mount<P: AsRef<Path>>(
     dev_name: P,
     dir_name: P,
     fs_type: P,
-    flags: usize,
-    data: usize,
+    flags: u32,
+    data_page: *mut core::ffi::c_void,
 ) -> Result<(), Errno> {
     let dev_name = CString::new(dev_name.as_ref());
     let dev_name_ptr = dev_name.as_ptr() as usize;
     let dir_name = CString::new(dir_name.as_ref());
     let dir_name_ptr = dir_name.as_ptr() as usize;
     let fs_type = CString::new(fs_type.as_ref());
     let fs_type_ptr = fs_type.as_ptr() as usize;
+    let flags = flags as usize;
+    let data_page = data_page as usize;
     syscall5(
         SYS_MOUNT,
         dev_name_ptr,
         dir_name_ptr,
         fs_type_ptr,
         flags,
-        data,
+        data_page,
     )
     .map(drop)
 }
@@ -9776,7 +9778,7 @@ pub unsafe fn umask(mode: mode_t) -> Result<mode_t, Errno> {
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));

diff --git a/src/platform/linux-loongarch64/call.rs b/src/platform/linux-loongarch64/call.rs
@@ -3549,7 +3549,7 @@ pub unsafe fn mmap(
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));
@@ -3561,22 +3561,24 @@ pub unsafe fn mount<P: AsRef<Path>>(
     dev_name: P,
     dir_name: P,
     fs_type: P,
-    flags: usize,
-    data: usize,
+    flags: u32,
+    data_page: *mut core::ffi::c_void,
 ) -> Result<(), Errno> {
     let dev_name = CString::new(dev_name.as_ref());
     let dev_name_ptr = dev_name.as_ptr() as usize;
     let dir_name = CString::new(dir_name.as_ref());
     let dir_name_ptr = dir_name.as_ptr() as usize;
     let fs_type = CString::new(fs_type.as_ref());
     let fs_type_ptr = fs_type.as_ptr() as usize;
+    let flags = flags as usize;
+    let data_page = data_page as usize;
     syscall5(
         SYS_MOUNT,
         dev_name_ptr,
         dir_name_ptr,
         fs_type_ptr,
         flags,
-        data,
+        data_page,
     )
     .map(drop)
 }
@@ -7949,7 +7951,7 @@ pub unsafe fn umask(mode: mode_t) -> Result<mode_t, Errno> {
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));

diff --git a/src/platform/linux-mips/call.rs b/src/platform/linux-mips/call.rs
@@ -4740,7 +4740,7 @@ pub unsafe fn mmap2(
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));
@@ -4752,22 +4752,24 @@ pub unsafe fn mount<P: AsRef<Path>>(
     dev_name: P,
     dir_name: P,
     fs_type: P,
-    flags: usize,
-    data: usize,
+    flags: u32,
+    data_page: *mut core::ffi::c_void,
 ) -> Result<(), Errno> {
     let dev_name = CString::new(dev_name.as_ref());
     let dev_name_ptr = dev_name.as_ptr() as usize;
     let dir_name = CString::new(dir_name.as_ref());
     let dir_name_ptr = dir_name.as_ptr() as usize;
     let fs_type = CString::new(fs_type.as_ref());
     let fs_type_ptr = fs_type.as_ptr() as usize;
+    let flags = flags as usize;
+    let data_page = data_page as usize;
     syscall5(
         SYS_MOUNT,
         dev_name_ptr,
         dir_name_ptr,
         fs_type_ptr,
         flags,
-        data,
+        data_page,
     )
     .map(drop)
 }
@@ -9879,7 +9881,7 @@ pub unsafe fn umask(mode: mode_t) -> Result<mode_t, Errno> {
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));
@@ -9908,7 +9910,7 @@ pub unsafe fn umount<P: AsRef<Path>>(name: P) -> Result<(), Errno> {
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));

diff --git a/src/platform/linux-mips64/call.rs b/src/platform/linux-mips64/call.rs
@@ -4478,7 +4478,7 @@ pub unsafe fn mmap(
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));
@@ -4490,22 +4490,24 @@ pub unsafe fn mount<P: AsRef<Path>>(
     dev_name: P,
     dir_name: P,
     fs_type: P,
-    flags: usize,
-    data: usize,
+    flags: u32,
+    data_page: *mut core::ffi::c_void,
 ) -> Result<(), Errno> {
     let dev_name = CString::new(dev_name.as_ref());
     let dev_name_ptr = dev_name.as_ptr() as usize;
     let dir_name = CString::new(dir_name.as_ref());
     let dir_name_ptr = dir_name.as_ptr() as usize;
     let fs_type = CString::new(fs_type.as_ref());
     let fs_type_ptr = fs_type.as_ptr() as usize;
+    let flags = flags as usize;
+    let data_page = data_page as usize;
     syscall5(
         SYS_MOUNT,
         dev_name_ptr,
         dir_name_ptr,
         fs_type_ptr,
         flags,
-        data,
+        data_page,
     )
     .map(drop)
 }
@@ -9461,7 +9463,7 @@ pub unsafe fn umask(mode: mode_t) -> Result<mode_t, Errno> {
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));

diff --git a/src/platform/linux-ppc64/call.rs b/src/platform/linux-ppc64/call.rs
@@ -4586,7 +4586,7 @@ pub unsafe fn mmap(
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));
@@ -4598,22 +4598,24 @@ pub unsafe fn mount<P: AsRef<Path>>(
     dev_name: P,
     dir_name: P,
     fs_type: P,
-    flags: usize,
-    data: usize,
+    flags: u32,
+    data_page: *mut core::ffi::c_void,
 ) -> Result<(), Errno> {
     let dev_name = CString::new(dev_name.as_ref());
     let dev_name_ptr = dev_name.as_ptr() as usize;
     let dir_name = CString::new(dir_name.as_ref());
     let dir_name_ptr = dir_name.as_ptr() as usize;
     let fs_type = CString::new(fs_type.as_ref());
     let fs_type_ptr = fs_type.as_ptr() as usize;
+    let flags = flags as usize;
+    let data_page = data_page as usize;
     syscall5(
         SYS_MOUNT,
         dev_name_ptr,
         dir_name_ptr,
         fs_type_ptr,
         flags,
-        data,
+        data_page,
     )
     .map(drop)
 }
@@ -9798,7 +9800,7 @@ pub unsafe fn umask(mode: mode_t) -> Result<mode_t, Errno> {
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));
@@ -9827,7 +9829,7 @@ pub unsafe fn umount<P: AsRef<Path>>(name: P) -> Result<(), Errno> {
 /// let src_dir = "/etc";
 /// let fs_type = "";
 /// let mount_flags = nc::MS_BIND | nc::MS_RDONLY;
-/// let data = 0;
+/// let data = std::ptr::null_mut();
 /// let ret = unsafe { nc::mount(src_dir, target_dir, fs_type, mount_flags, data) };
 /// assert!(ret.is_err());
 /// assert_eq!(ret, Err(nc::EPERM));