summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTiger Yang <tiger.yang@oracle.com>2011-03-02 12:32:09 +0100
committerJoel Becker <jlbec@evilplan.org>2011-05-24 08:37:12 +0200
commite2b0c215c2bd57693af69f7a430585109c02b07f (patch)
tree1b3197508edd4045267dfb1d71c46a3acf9ae1ec /fs
parentMerge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let... (diff)
downloadlinux-e2b0c215c2bd57693af69f7a430585109c02b07f.tar.xz
linux-e2b0c215c2bd57693af69f7a430585109c02b07f.zip
ocfs2: clean up mount option about atime in ocfs2.txt
As ocfs2 supports relatime and strictatime, we need update the relative document. Atime_quantum need work with strictatime, so only show it in procfs when mount with strictatime. Signed-off-by: Tiger Yang <tiger.yang@oracle.com> Signed-off-by: Joel Becker <jlbec@evilplan.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 5a521c748859..823bc35334e0 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1566,7 +1566,7 @@ static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt)
if (osb->preferred_slot != OCFS2_INVALID_SLOT)
seq_printf(s, ",preferred_slot=%d", osb->preferred_slot);
- if (osb->s_atime_quantum != OCFS2_DEFAULT_ATIME_QUANTUM)
+ if (!(mnt->mnt_flags & MNT_NOATIME) && !(mnt->mnt_flags & MNT_RELATIME))
seq_printf(s, ",atime_quantum=%u", osb->s_atime_quantum);
if (osb->osb_commit_interval)