Added in relatime mount option so mount.nfs stays

compatible with the mount command in util-linux-ng

Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index ea47cb48e4e17e3bebf0d44983efc77c127a92d4..403d6f43adeb4c0cd9b899ff3f35be32986c0a8c 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -129,6 +129,12 @@ static const struct opt_map opt_map[] = {
 #ifdef MS_NODIRATIME
   { "diratime", 0, 1, MS_NODIRATIME },  /* Update dir access times */
   { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
+#endif
+#ifdef MS_RELATIME
+  { "relatime", 0, 0, MS_RELATIME },   /* Update access times relative to
+                      mtime/ctime */
+  { "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard
+                      to mtime/ctime */
 #endif
   { NULL,      0, 0, 0         }
 };

diff --git a/utils/mount/mount_constants.h b/utils/mount/mount_constants.h
index 7c972da3dcb2c4354e8c6998fc6fccb26da3a123..4f3c729d8738128faf20eb68a733f017f74ec815 100644 (file)
--- a/utils/mount/mount_constants.h
+++ b/utils/mount/mount_constants.h
@@ -39,7 +39,10 @@ if we have a stack or plain mount - mount atop of it, forming a stack. */
 #ifndef MS_VERBOSE
 #define MS_VERBOSE     0x8000  /* 32768 */
 #endif
-
+#ifndef MS_RELATIME
+#define MS_RELATIME 0x200000 /* 200000: Update access times relative
+                                  to mtime/ctime */
+#endif
 /*
  * NFS fs-specific mount option flags
  *