From 82ab5bbac5d115b7cae4f3ca28f3ba8cce9431ba Mon Sep 17 00:00:00 2001 From: Flávio Cruz Date: Mon, 5 Mar 2018 02:58:41 +0100 Subject: Add file_utimens RPC to use a struct timespec and update the servers to use UTIME_NOW and UTIME_OMIT. * console-client/trans.c (netfs_attempt_utimes): Do not set current time ourself. * console/console.c (netfs_attempt_utimes): Likewise. * ftpfs/netfs.c (netfs_attempt_utimes): Likewise. * hostmux/node.c (netfs_attempt_utimes): Likewise. * usermux/node.c (netfs_attempt_utimes): Likewise. * nfs/ops.c (netfs_attempt_utimes): Likewise. * doc/hurd.texi (file_utimens): Add documentation. * hurd/fs.defs (file_utimens): Add RPC. * libdiskfs/file-utimes.c (diskfs_S_file_utimes): Move implementation and replace with translation layer with... (diskfs_S_file_utimens): ... new function. * libnetfs/file-utimes.c (netfs_S_file_utimes): Likewise with... (netfs_S_file_utimens): ... new function. * libnetfs/init-init.c: Include . (netfs_mtime): New variable. (netfs_init): New function. * libnetfs/netfs.h (netfs_attempt_utimes): Update documentation. * libnetfs/priv.h (netfs_mtime): Declare variable. * libtreefs/s-file.c (treefs_S_file_utimes): Convert time values and call treefs_s_file_utimens instead of treefs_s_file_utimes. * libtreefs/treefs-hooks.h: Replace TREEFS_HOOK_S_FILE_UTIMES with TREEFS_HOOK_S_FILE_UTIMENS. * libtreefs/treefs-s-hooks.h: Replace s_file_utimes with s_file_utimens. * libtrivfs/file-utimes.c (trivfs_S_file_utimens): New function. * libtrivfs/times.c (trivfs_set_atime): Try to use file_utimens before using file_utimes. (trivfs_set_mtime): Likewise. * nfsd/ops.c (complete_setattr): Likewise. * trans/fakeroot.c (netfs_attempt_utimes): Likewise. * nfs/nfs.c (xdr_encode_sattr_times): Do not set atime or mtime when they are NULL. * configure.ac: Look for file_futimens, and define UTIME_NOW/OMIT, for compatibility with old glibcs. --- nfsd/ops.c | 62 ++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 24 deletions(-) (limited to 'nfsd/ops.c') diff --git a/nfsd/ops.c b/nfsd/ops.c index aa37c4a4..4be45fb2 100644 --- a/nfsd/ops.c +++ b/nfsd/ops.c @@ -63,7 +63,7 @@ complete_setattr (mach_port_t port, { uid_t uid, gid; off_t size; - time_value_t atime, mtime; + struct timespec atime, mtime; struct stat st; error_t err; @@ -91,34 +91,48 @@ complete_setattr (mach_port_t port, if (err) return err; - atime.seconds = ntohl (*p); + atime.tv_sec = ntohl (*p); p++; - atime.microseconds = ntohl (*p); + atime.tv_nsec = ntohl (*p) * 1000; p++; - mtime.seconds = ntohl (*p); + mtime.tv_sec = ntohl (*p); p++; - mtime.microseconds = ntohl (*p); + mtime.tv_nsec = ntohl (*p) * 1000; p++; - if (atime.seconds != -1 && atime.microseconds == -1) - atime.microseconds = 0; - if (mtime.seconds != -1 && mtime.microseconds == -1) - mtime.microseconds = 0; - - if (atime.seconds == -1) - atime.seconds = st.st_atim.tv_sec; - if (atime.microseconds == -1) - atime.microseconds = st.st_atim.tv_nsec / 1000; - if (mtime.seconds == -1) - mtime.seconds = st.st_mtim.tv_sec; - if (mtime.microseconds == -1) - mtime.microseconds = st.st_mtim.tv_nsec / 1000; - - if (atime.seconds != st.st_atim.tv_sec - || atime.microseconds != st.st_atim.tv_nsec / 1000 - || mtime.seconds != st.st_mtim.tv_sec - || mtime.microseconds != st.st_mtim.tv_nsec / 1000) - err = file_utimes (port, atime, mtime); + if (atime.tv_sec != -1 && atime.tv_nsec == -1) + atime.tv_nsec = 0; + if (mtime.tv_sec != -1 && mtime.tv_nsec == -1) + mtime.tv_nsec = 0; + + if (atime.tv_nsec == -1) + atime.tv_sec = st.st_atim.tv_sec; + if (atime.tv_nsec == -1) + atime.tv_nsec = st.st_atim.tv_nsec; + if (mtime.tv_sec == -1) + mtime.tv_sec = st.st_mtim.tv_sec; + if (mtime.tv_nsec == -1) + mtime.tv_nsec = st.st_mtim.tv_nsec; + + if (atime.tv_sec != st.st_atim.tv_sec + || atime.tv_nsec != st.st_atim.tv_nsec + || mtime.tv_sec != st.st_mtim.tv_sec + || mtime.tv_nsec != st.st_mtim.tv_nsec) + { +#ifdef HAVE_FILE_UTIMENS + err = file_utimens (port, atime, mtime); + + if (err == MIG_BAD_ID || err == EOPNOTSUPP) +#endif + { + time_value_t atim, mtim; + + TIMESPEC_TO_TIME_VALUE (&atim, &atime); + TIMESPEC_TO_TIME_VALUE (&mtim, &mtime); + + err = file_utimes (port, atim, mtim); + } + } return err; } -- cgit v1.2.3