diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 19:34:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 19:34:11 -0400 |
| commit | acd15a836053ff6b48e78dc6de388b225ba9e40d (patch) | |
| tree | 9dec0be18d746c5fb0d105233f50ebe7df455708 /Documentation | |
| parent | 72f22b1eb6ca5e4676a632a04d40d46cb61d4562 (diff) | |
| parent | d4a8c93c8248534bdedb07f83c9aebd6f7d1d579 (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: (56 commits)
ocfs2: Make cached block reads the common case.
ocfs2: Kill the last naked wait_on_buffer() for cached reads.
ocfs2: Move ocfs2_bread() into dir.c
ocfs2: Simplify ocfs2_read_block()
ocfs2: Require an inode for ocfs2_read_block(s)().
ocfs2: Separate out sync reads from ocfs2_read_blocks()
ocfs2: Refactor xattr list and remove ocfs2_xattr_handler().
ocfs2: Calculate EA hash only by its suffix.
ocfs2: Move trusted and user attribute support into xattr.c
ocfs2: Uninline ocfs2_xattr_name_hash()
ocfs2: Don't check for NULL before brelse()
ocfs2: use smaller counters in ocfs2_remove_xattr_clusters_from_cache
ocfs2: Documentation update for user_xattr / nouser_xattr mount options
ocfs2: make la_debug_mutex static
ocfs2: Remove pointless !!
ocfs2: Add empty bucket support in xattr.
ocfs2/xattr.c: Fix a bug when inserting xattr.
ocfs2: Add xattr mount option in ocfs2_show_options()
ocfs2: Switch over to JBD2.
ocfs2: Add the 'inode64' mount option.
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/ocfs2.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt index c318a8bbb1ef..4340cc825796 100644 --- a/Documentation/filesystems/ocfs2.txt +++ b/Documentation/filesystems/ocfs2.txt | |||
| @@ -76,3 +76,9 @@ localalloc=8(*) Allows custom localalloc size in MB. If the value is too | |||
| 76 | large, the fs will silently revert it to the default. | 76 | large, the fs will silently revert it to the default. |
| 77 | Localalloc is not enabled for local mounts. | 77 | Localalloc is not enabled for local mounts. |
| 78 | localflocks This disables cluster aware flock. | 78 | localflocks This disables cluster aware flock. |
| 79 | inode64 Indicates that Ocfs2 is allowed to create inodes at | ||
| 80 | any location in the filesystem, including those which | ||
| 81 | will result in inode numbers occupying more than 32 | ||
| 82 | bits of significance. | ||
| 83 | user_xattr (*) Enables Extended User Attributes. | ||
| 84 | nouser_xattr Disables Extended User Attributes. | ||