diff options
author | Andrew Walbran <qwandor@google.com> | 2020-10-22 22:49:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-22 22:49:36 +0000 |
commit | 245ea0eac653013374aaaa04c59437b70f603864 (patch) | |
tree | 63867ac016a12c0630b429023740c34460a3d58e /src/server/mod.rs | |
parent | c63ba63bb78506917e471738b782ea8b1a70de3d (diff) | |
parent | 603ff865521389dd1c4c1c9e23ec60aa8d9f7b57 (diff) | |
download | p9-245ea0eac653013374aaaa04c59437b70f603864.tar.gz |
p9: Use std::os::unix rather than std::os::linux. am: 1025034f05 am: 036c8e1562 am: 02af803f2c am: 603ff86552
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468199
Change-Id: I6ff5981ced304d41a64ccc3c70a5665017a14008
Diffstat (limited to 'src/server/mod.rs')
-rw-r--r-- | src/server/mod.rs | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/server/mod.rs b/src/server/mod.rs index c25cb3b..6a4a5c1 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -8,7 +8,7 @@ use std::ffi::CString; use std::fs; use std::io::{self, Cursor, Read, Write}; use std::mem; -use std::os::linux::fs::MetadataExt; +use std::os::unix::fs::MetadataExt; use std::os::unix::fs::{DirBuilderExt, FileExt, OpenOptionsExt}; use std::os::unix::io::AsRawFd; use std::path::{Component, Path, PathBuf}; @@ -126,8 +126,8 @@ fn metadata_to_qid(metadata: &fs::Metadata) -> Qid { Qid { ty, // TODO: deal with the 2038 problem before 2038 - version: metadata.st_mtime() as u32, - path: metadata.st_ino(), + version: metadata.mtime() as u32, + path: metadata.ino(), } } @@ -634,20 +634,20 @@ impl Server { Ok(Rgetattr { valid: P9_GETATTR_BASIC, qid: metadata_to_qid(&fid.metadata), - mode: fid.metadata.st_mode(), - uid: map_id_from_host(&self.uid_map, fid.metadata.st_uid()), - gid: map_id_from_host(&self.gid_map, fid.metadata.st_gid()), - nlink: fid.metadata.st_nlink(), - rdev: fid.metadata.st_rdev(), - size: fid.metadata.st_size(), - blksize: fid.metadata.st_blksize(), - blocks: fid.metadata.st_blocks(), - atime_sec: fid.metadata.st_atime() as u64, - atime_nsec: fid.metadata.st_atime_nsec() as u64, - mtime_sec: fid.metadata.st_mtime() as u64, - mtime_nsec: fid.metadata.st_mtime_nsec() as u64, - ctime_sec: fid.metadata.st_ctime() as u64, - ctime_nsec: fid.metadata.st_ctime_nsec() as u64, + mode: fid.metadata.mode(), + uid: map_id_from_host(&self.uid_map, fid.metadata.uid()), + gid: map_id_from_host(&self.gid_map, fid.metadata.gid()), + nlink: fid.metadata.nlink(), + rdev: fid.metadata.rdev(), + size: fid.metadata.size(), + blksize: fid.metadata.blksize(), + blocks: fid.metadata.blocks(), + atime_sec: fid.metadata.atime() as u64, + atime_nsec: fid.metadata.atime_nsec() as u64, + mtime_sec: fid.metadata.mtime() as u64, + mtime_nsec: fid.metadata.mtime_nsec() as u64, + ctime_sec: fid.metadata.ctime() as u64, + ctime_nsec: fid.metadata.ctime_nsec() as u64, btime_sec: 0, btime_nsec: 0, gen: 0, |