From da5b44eaf131c748caeedf59b3dc9e42b94c82f0 Mon Sep 17 00:00:00 2001 From: Ryan Jeffrey Date: Wed, 30 Sep 2020 21:19:52 +0200 Subject: libdiskfs: Add relatime support * doc/hurd.texi (diskfs_set_node_atime): Document relatime behavior. * libdiskfs/diskfs.h (diskfs_set_node_atime): Likewise. * libdiskfs/init-init.c (_diskfs_relatime): Add variable. * libdiskfs/file-statfs.c (ST_RELATIME): Define if not defined already. (diskfs_S_file_statfs): Report ST_RELATIME when _diskfs_relatime is set. * libdiskfs/node-times.c (atime_should_update): New function. (diskfs_set_node_atime): Document relatime behavior. Call atime_should_update instead of reading _diskfs_noatime. * libdiskfs/opts-common.c (diskfs_common_options): Add --strictatime and -R/--relatime options. * libdiskfs/opts-std-runtime.c (struct parse_hook): Add relatime field. (set_opts): Set _diskfs_relatime from relatime field. (parse_opt): Parse -R option. * libdiskfs/opts-std-startup.c (parse_startup_opt): Parse -R option. * libdiskfs/priv.h (_diskfs_relatime): Declare variable. (atime_should_update): Declare function. * libdiskfs/opts-append-std.c (diskfs_append_std_options): Add reporting --relatime option. * libdiskfs/conch-fetch.c (iohelp_fetch_shared_data): Call atime_should_update instead of reading _diskfs_noatime. * libdiskfs/rdwr-internal.c (_diskfs_rdwr_internal): Likewise. --- libdiskfs/opts-std-startup.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'libdiskfs/opts-std-startup.c') diff --git a/libdiskfs/opts-std-startup.c b/libdiskfs/opts-std-startup.c index a38db99a..e5531a46 100644 --- a/libdiskfs/opts-std-startup.c +++ b/libdiskfs/opts-std-startup.c @@ -86,10 +86,22 @@ parse_startup_opt (int opt, char *arg, struct argp_state *state) TOGGLE (diskfs_readonly, 'r', 'w'); TOGGLE (_diskfs_nosuid, 'S', OPT_SUID_OK); TOGGLE (_diskfs_noexec, 'E', OPT_EXEC_OK); - TOGGLE (_diskfs_noatime, 'A', OPT_ATIME); TOGGLE (_diskfs_no_inherit_dir_group, OPT_NO_INHERIT_DIR_GROUP, OPT_INHERIT_DIR_GROUP); #undef TOGGLE + /* The next three cases must be done manually to avoid duplicates */ + case 'A': + _diskfs_noatime = 1; + break; + + case 'R': + _diskfs_relatime = 1; + break; + + case OPT_ATIME: /* strictatime. */ + _diskfs_noatime = 0; + _diskfs_relatime = 0; + break; case 's': if (arg == NULL) -- cgit v1.2.3