diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 13:21:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 13:21:01 -0500 |
commit | 741441ab7800f1eb031e74fd720f4f8f361678ed (patch) | |
tree | cd265afa96c3753116f570e483408ed8a94fe1d7 /Documentation | |
parent | 659dba34807692a6ebd55e7859dff2c7cb1b005d (diff) | |
parent | 828ae6afbef03bfe107a4a8cc38798419d6a2765 (diff) |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
[patch 3/3] OCFS2 Configurable timeouts - Protocol changes
[patch 2/3] OCFS2 Configurable timeouts
[patch 1/3] OCFS2 - Expose struct o2nm_cluster
ocfs2: Synchronize feature incompat flags in ocfs2_fs.h
ocfs2: update mount option documentation
ocfs2: local mounts
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/filesystems/ocfs2.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt index af6defd10cb6..8ccf0c1b58ed 100644 --- a/Documentation/filesystems/ocfs2.txt +++ b/Documentation/filesystems/ocfs2.txt | |||
@@ -54,3 +54,6 @@ errors=panic Panic and halt the machine if an error occurs. | |||
54 | intr (*) Allow signals to interrupt cluster operations. | 54 | intr (*) Allow signals to interrupt cluster operations. |
55 | nointr Do not allow signals to interrupt cluster | 55 | nointr Do not allow signals to interrupt cluster |
56 | operations. | 56 | operations. |
57 | atime_quantum=60(*) OCFS2 will not update atime unless this number | ||
58 | of seconds has passed since the last update. | ||
59 | Set to zero to always update atime. | ||