diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /Documentation/filesystems/ocfs2.txt | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'Documentation/filesystems/ocfs2.txt')
| -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. | ||