diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 13:05:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 13:05:22 -0400 |
| commit | 34116645d912f65d7eb4508a1db3c9d0e45facb1 (patch) | |
| tree | 27283af2d429df5884637d1baa7306116ab26fcb /Documentation/filesystems | |
| parent | de0a5345a55b8dd5a4695181275df0e691176830 (diff) | |
| parent | ed47a7d00c22b326fc4c97342a73ecd15929732e (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
udf: Cleanup metadata flags handling
udf: Skip mirror metadata FE loading when metadata FE is ok
ext3: Allow quota file use root reservation
udf: Remove web reference from UDF MAINTAINERS entry
quota: Drop path reference on error exit from quotactl
udf: Neaten udf_debug uses
udf: Neaten logging output, use vsprintf extension %pV
udf: Convert printks to pr_<level>
udf: Rename udf_warning to udf_warn
udf: Rename udf_error to udf_err
udf: Promote some debugging messages to udf_error
ext3: Remove the obsolete broken EXT3_IOC32_WAIT_FOR_READONLY.
udf: Add readpages support for udf.
ext3/balloc.c: local functions should be static
ext2: fix the outdated comment in ext2_nfs_get_inode()
ext3: remove deprecated oldalloc
fs/ext3/balloc.c: delete useless initialization
fs/ext2/balloc.c: delete useless initialization
ext3: fix message in ext3_remount for rw-remount case
ext3: Remove i_mutex from ext3_sync_file()
Fix up trivial (printf format cleanup) conflicts in fs/udf/udfdecl.h
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/ext3.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt index 22f3a0eda1d2..b100adc38adb 100644 --- a/Documentation/filesystems/ext3.txt +++ b/Documentation/filesystems/ext3.txt | |||
| @@ -73,14 +73,6 @@ nobarrier (*) This also requires an IO stack which can support | |||
| 73 | also be used to enable or disable barriers, for | 73 | also be used to enable or disable barriers, for |
| 74 | consistency with other ext3 mount options. | 74 | consistency with other ext3 mount options. |
| 75 | 75 | ||
| 76 | orlov (*) This enables the new Orlov block allocator. It is | ||
| 77 | enabled by default. | ||
| 78 | |||
| 79 | oldalloc This disables the Orlov block allocator and enables | ||
| 80 | the old block allocator. Orlov should have better | ||
| 81 | performance - we'd like to get some feedback if it's | ||
| 82 | the contrary for you. | ||
| 83 | |||
| 84 | user_xattr Enables Extended User Attributes. Additionally, you | 76 | user_xattr Enables Extended User Attributes. Additionally, you |
| 85 | need to have extended attribute support enabled in the | 77 | need to have extended attribute support enabled in the |
| 86 | kernel configuration (CONFIG_EXT3_FS_XATTR). See the | 78 | kernel configuration (CONFIG_EXT3_FS_XATTR). See the |