diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 17:23:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 17:23:16 -0700 |
commit | 577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d (patch) | |
tree | 8b3d6902494dcf3d872ce7e47ebe38846f0d8895 /Documentation | |
parent | 7111de76438e05ceab8ba2a471192fa3ea6c3572 (diff) | |
parent | e535e2efd295c3990bb9f654c8bb6bd176ebdc2b (diff) | |
download | blackbird-obmc-linux-577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d.tar.gz blackbird-obmc-linux-577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d.zip |
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:
ocfs2: Fix calculation of i_blocks during truncate
[PATCH] ocfs2: Fix a wrong cluster calculation.
[PATCH] ocfs2: fix mount option parsing
ocfs2: update docs for new features
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/filesystems/ocfs2.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt index 8ccf0c1b58ed..ed55238023a9 100644 --- a/Documentation/filesystems/ocfs2.txt +++ b/Documentation/filesystems/ocfs2.txt @@ -28,11 +28,7 @@ Manish Singh <manish.singh@oracle.com> Caveats ======= Features which OCFS2 does not support yet: - - sparse files - extended attributes - - shared writable mmap - - loopback is supported, but data written will not - be cluster coherent. - quotas - cluster aware flock - cluster aware lockf @@ -57,3 +53,12 @@ nointr Do not allow signals to interrupt cluster atime_quantum=60(*) OCFS2 will not update atime unless this number of seconds has passed since the last update. Set to zero to always update atime. +data=ordered (*) All data are forced directly out to the main file + system prior to its metadata being committed to the + journal. +data=writeback Data ordering is not preserved, data may be written + into the main file system after its metadata has been + committed to the journal. +preferred_slot=0(*) During mount, try to use this filesystem slot first. If + it is in use by another node, the first empty one found + will be chosen. Invalid values will be ignored. |