youngkingdom/s3fs-fuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve sub-second precision where possible (#1915)

Browse Source
This commit is contained in:
Andrew Gaul
2022-02-23 23:58:51 +09:00
committed by GitHub
parent 01e24967b6
commit 8a5c4306f5
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cache.cpp
View File

@ -792,6 +792,7 @@ bool convert_header_to_stat(const char* path, const headers_t& meta, struct stat
}
#if defined(__APPLE__)
pst->st_mtime = mtime.tv_sec;
pst->st_mtimespec.tv_nsec = mtime.tv_nsec;
#else
pst->st_mtim.tv_sec = mtime.tv_sec;
pst->st_mtim.tv_nsec = mtime.tv_nsec;
@ -809,6 +810,7 @@ bool convert_header_to_stat(const char* path, const headers_t& meta, struct stat
}
#if defined(__APPLE__)
pst->st_ctime = ctime.tv_sec;
pst->st_ctimespec.tv_nsec = ctime.tv_nsec;
#else
pst->st_ctim.tv_sec = ctime.tv_sec;
pst->st_ctim.tv_nsec = ctime.tv_nsec;
@ -826,6 +828,7 @@ bool convert_header_to_stat(const char* path, const headers_t& meta, struct stat
}
#if defined(__APPLE__)
pst->st_atime = atime.tv_sec;
pst->st_atimespec.tv_nsec = atime.tv_nsec;
#else
pst->st_atim.tv_sec = atime.tv_sec;
pst->st_atim.tv_nsec = atime.tv_nsec;

32
src/fdcache_entity.cpp
View File

@ -793,10 +793,12 @@ int FdEntity::SetMCtime(struct timespec mtime, struct timespec ctime, bool lock_
}
}else if(!cachepath.empty()){
// not opened file yet.
struct utimbuf n_time;
n_time.modtime = mtime.tv_sec;
n_time.actime = ctime.tv_sec;
if(-1 == utime(cachepath.c_str(), &n_time)){
struct timeval n_time[2];
n_time[0].tv_sec = ctime.tv_sec;
n_time[0].tv_usec = ctime.tv_nsec / 1000;
n_time[1].tv_sec = mtime.tv_sec;
n_time[1].tv_usec = mtime.tv_nsec / 1000;
if(-1 == utimes(cachepath.c_str(), n_time)){
S3FS_PRN_ERR("utime failed. errno(%d)", errno);
return -errno;
}
@ -884,18 +886,30 @@ bool FdEntity::ClearHoldingMtime(bool lock_already_held)
struct timeval tv[2];
tv[0].tv_sec = holding_mtime.tv_sec;
tv[0].tv_usec = holding_mtime.tv_nsec / 1000;
#if defined(__APPLE__)
tv[1].tv_sec = st.st_ctime;
tv[1].tv_usec = 0;
tv[1].tv_usec = st.st_ctimespec.tv_nsec / 1000;
#else
tv[1].tv_sec = st.st_ctim.tv_sec;
tv[1].tv_usec = st.st_ctim.tv_nsec / 1000;
#endif
if(-1 == futimes(physical_fd, tv)){
S3FS_PRN_ERR("futimes failed. errno(%d)", errno);
return false;
}
}else if(!cachepath.empty()){
// not opened file yet.
struct utimbuf n_time;
n_time.modtime = holding_mtime.tv_sec;
n_time.actime = st.st_ctime;
if(-1 == utime(cachepath.c_str(), &n_time)){
struct timeval n_time[2];
#if defined(__APPLE__)
n_time[0].tv_sec = st.st_ctime;
n_time[0].tv_usec = st.st_ctimespec.tv_nsec / 1000;
#else
n_time[0].tv_sec = st.st_ctime;
n_time[0].tv_usec = st.st_ctim.tv_nsec / 1000;
#endif
n_time[1].tv_sec = holding_mtime.tv_sec;
n_time[1].tv_usec = holding_mtime.tv_nsec / 1000;
if(-1 == utimes(cachepath.c_str(), n_time)){
S3FS_PRN_ERR("utime failed. errno(%d)", errno);
return false;
}