From e79892cd00c3c71795a9bbc062268d02e4c4d810 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sun, 19 Apr 2009 18:40:43 +0200 Subject: [PATCH] --- yaml --- r: 143706 b: refs/heads/master c: 613cbe3d4870429bf2e816d4bbe3146d157ee5c1 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 6d93c93d278c..fe71812eabfd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff54250a0ebab7f90a5f848a0ba63f999830c872 +refs/heads/master: 613cbe3d4870429bf2e816d4bbe3146d157ee5c1 diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c index c6f54e4c4290..d9138f81ec10 100644 --- a/trunk/fs/namespace.c +++ b/trunk/fs/namespace.c @@ -1920,8 +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; + /* Default to relatime unless overriden */ + if (!(flags & MS_NOATIME)) + mnt_flags |= MNT_RELATIME; /* Separate the per-mountpoint flags */ if (flags & MS_NOSUID)