summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2009-04-20 19:59:09 +0000
committerSteve French <sfrench@us.ibm.com>2009-04-20 19:59:09 +0000
commitcbb7fe129bb2b836083ebcc256c43faff4b48cc2 (patch)
tree65998c06e712be5f7cb72543a7c0cc2d0b1b4459 /fs
parent7b0c8fcff47a885743125dd843db64af41af5a61 (diff)
parenta939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff)
downloadop-kernel-dev-cbb7fe129bb2b836083ebcc256c43faff4b48cc2.zip
op-kernel-dev-cbb7fe129bb2b836083ebcc256c43faff4b48cc2.tar.gz
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs')
-rw-r--r--fs/namespace.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index c6f54e4..d9138f8 100644
--- a/fs/namespace.c
+++ b/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)
OpenPOWER on IntegriCloud