From da5b44eaf131c748caeedf59b3dc9e42b94c82f0 Mon Sep 17 00:00:00 2001
From: Ryan Jeffrey <ryan@ryanmj.xyz>
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/node-times.c | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

(limited to 'libdiskfs/node-times.c')

diff --git a/libdiskfs/node-times.c b/libdiskfs/node-times.c
index 9a6c8dd9..05f558be 100644
--- a/libdiskfs/node-times.c
+++ b/libdiskfs/node-times.c
@@ -24,12 +24,45 @@
 #include "priv.h"
 #include <maptime.h>
 
+/* If the disk is not readonly and noatime is not set, then check relatime
+   conditions: if either `np->dn_stat.st_mtim.tv_sec' or
+   `np->dn_stat.st_ctim.tv_sec' is greater than `np->dn_stat.st_atim.tv_sec',
+   or if the atime is greater than 24 hours old, return true.
+   */
+int
+atime_should_update (struct node *np)
+{
+  struct timeval t;
+
+  if (_diskfs_noatime)
+    return 0;
+
+  if (_diskfs_relatime)
+    {
+      /* Update atime if mtime is younger than atime. */
+      if (np->dn_stat.st_mtim.tv_sec > np->dn_stat.st_atim.tv_sec)
+        return 1;
+      /* Update atime if ctime is younger than atime. */
+      if (np->dn_stat.st_ctim.tv_sec > np->dn_stat.st_atim.tv_sec)
+        return 1;
+      /* Update atime if current atime is more than 24 hours old. */
+      maptime_read (diskfs_mtime, &t);
+      if ((long)(t.tv_sec - np->dn_stat.st_atim.tv_sec) >= 24 * 60 * 60)
+          return 1;
+      return 0;
+    }
+
+  return 1; /* strictatime */
+}
+
 /* If disk is not readonly and the noatime option is not enabled, set
-   NP->dn_set_atime.  */
+   NP->dn_set_atime.  If relatime is enabled, only set NP->dn_set_atime
+   if the atime has not been updated today, or if ctime or mtime are
+   more recent than atime */
 void
 diskfs_set_node_atime (struct node *np)
 {
-  if (!_diskfs_noatime && !diskfs_check_readonly ())
+  if (!diskfs_check_readonly () && atime_should_update (np))
     np->dn_set_atime = 1;
 }
 
-- 
cgit v1.2.3