Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[karo-tx-linux.git] / Documentation / filesystems / xfs.txt

diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt
index 3fc0c31a6f5dc5f8ee1220d9bcf8062038297aa5..3e4b3dd1e046a76b02c45f91c8779ae82e402d1f 100644 (file)
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
@@ -43,7 +43,7 @@ When mounting an XFS filesystem, the following options are accepted.
        Issue command to let the block device reclaim space freed by the
        filesystem.  This is useful for SSD devices, thinly provisioned
        LUNs and virtual machine images, but may have a performance
-       impact.  This option is incompatible with the nodelaylog option.
+       impact.
 
   dmapi
        Enable the DMAPI (Data Management API) event callouts.
@@ -72,8 +72,15 @@ When mounting an XFS filesystem, the following options are accepted.
        Indicates that XFS is allowed to create inodes at any location
        in the filesystem, including those which will result in inode
        numbers occupying more than 32 bits of significance.  This is
-       provided for backwards compatibility, but causes problems for
-       backup applications that cannot handle large inode numbers.
+       the default allocation option. Applications which do not handle
+       inode numbers bigger than 32 bits, should use inode32 option.
+
+  inode32
+       Indicates that XFS is limited to create inodes at locations which
+       will not result in inode numbers with more than 32 bits of
+       significance. This is provided for backwards compatibility, since
+       64 bits inode numbers might cause problems for some applications
+       that cannot handle large inode numbers.
 
   largeio/nolargeio
        If "nolargeio" is specified, the optimal I/O reported in