From 6353817af80fed0cc50b472f89dd04c321b13095 Mon Sep 17 00:00:00 2001 From: "xiaoli.zhang" Date: Wed, 12 Jan 2022 15:09:31 +0800 Subject: [PATCH] Fix incompatible timespec convertion --- deps/sefs | 2 +- src/libos/src/fs/hostfs.rs | 6 +++--- src/libos/src/time/mod.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deps/sefs b/deps/sefs index 522fe556..d26132ca 160000 --- a/deps/sefs +++ b/deps/sefs @@ -1 +1 @@ -Subproject commit 522fe55653791084f2dad0d3766b4e48b332b101 +Subproject commit d26132ca7b5a3338046e4b644cb75953981f0feb diff --git a/src/libos/src/fs/hostfs.rs b/src/libos/src/fs/hostfs.rs index ca39a396..57d1845f 100644 --- a/src/libos/src/fs/hostfs.rs +++ b/src/libos/src/fs/hostfs.rs @@ -343,15 +343,15 @@ impl IntoFsMetadata for fs::Metadata { blocks: self.st_blocks() as usize, atime: Timespec { sec: self.st_atime(), - nsec: self.st_atime_nsec() as i32, + nsec: self.st_atime_nsec(), }, mtime: Timespec { sec: self.st_mtime(), - nsec: self.st_mtime_nsec() as i32, + nsec: self.st_mtime_nsec(), }, ctime: Timespec { sec: self.st_ctime(), - nsec: self.st_ctime_nsec() as i32, + nsec: self.st_ctime_nsec(), }, type_: match self.st_mode() & 0xf000 { libc::S_IFCHR => FileType::CharDevice, diff --git a/src/libos/src/time/mod.rs b/src/libos/src/time/mod.rs index d3f1036d..f5172fe6 100644 --- a/src/libos/src/time/mod.rs +++ b/src/libos/src/time/mod.rs @@ -248,7 +248,7 @@ impl TimeProvider for OcclumTimeProvider { let time = do_gettimeofday(); Timespec { sec: time.sec, - nsec: time.usec as i32 * 1000, + nsec: time.usec * 1000, } } }