From d1ef06ced2cdf9372e56b767b0a37e4091d649a6 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Thu, 26 Mar 2009 17:53:14 +0000 Subject: [PATCH] --- yaml --- r: 132564 b: refs/heads/master c: 0a1c01c9477602ee8b44548a9405b2c1d587b5a2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/namespace.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 69ad4b49ce2f..15de84a8a68f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0adde574b8487ef30f69e2d08bba769e4be513f +refs/heads/master: 0a1c01c9477602ee8b44548a9405b2c1d587b5a2 diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c index d0659ec291c9..f0e753097353 100644 --- a/trunk/fs/namespace.c +++ b/trunk/fs/namespace.c @@ -1920,6 +1920,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page, if (data_page) ((char *)data_page)[PAGE_SIZE - 1] = 0; + /* Default to relatime */ + mnt_flags |= MNT_RELATIME; + /* Separate the per-mountpoint flags */ if (flags & MS_NOSUID) mnt_flags |= MNT_NOSUID; @@ -1931,8 +1934,6 @@ long do_mount(char *dev_name, char *dir_name, char *type_page, mnt_flags |= MNT_NOATIME; if (flags & MS_NODIRATIME) mnt_flags |= MNT_NODIRATIME; - if (flags & MS_RELATIME) - mnt_flags |= MNT_RELATIME; if (flags & MS_STRICTATIME) mnt_flags &= ~(MNT_RELATIME | MNT_NOATIME); if (flags & MS_RDONLY)