Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tiger Yang and committed by
Joel Becker
e2b0c215 d762f438

+8 -2
+7 -1
Documentation/filesystems/ocfs2.txt
··· 46 46 intr (*) Allow signals to interrupt cluster operations. 47 47 nointr Do not allow signals to interrupt cluster 48 48 operations. 49 + noatime Do not update access time. 50 + relatime(*) Update atime if the previous atime is older than 51 + mtime or ctime 52 + strictatime Always update atime, but the minimum update interval 53 + is specified by atime_quantum. 49 54 atime_quantum=60(*) OCFS2 will not update atime unless this number 50 55 of seconds has passed since the last update. 51 - Set to zero to always update atime. 56 + Set to zero to always update atime. This option need 57 + work with strictatime. 52 58 data=ordered (*) All data are forced directly out to the main file 53 59 system prior to its metadata being committed to the 54 60 journal.
+1 -1
fs/ocfs2/super.c
··· 1566 1566 if (osb->preferred_slot != OCFS2_INVALID_SLOT) 1567 1567 seq_printf(s, ",preferred_slot=%d", osb->preferred_slot); 1568 1568 1569 - if (osb->s_atime_quantum != OCFS2_DEFAULT_ATIME_QUANTUM) 1569 + if (!(mnt->mnt_flags & MNT_NOATIME) && !(mnt->mnt_flags & MNT_RELATIME)) 1570 1570 seq_printf(s, ",atime_quantum=%u", osb->s_atime_quantum); 1571 1571 1572 1572 if (osb->osb_commit_interval)