Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / Documentation / filesystems / xfs.txt

diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt
index 7bff3e4..3fc0c31 100644 (file)
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
@@ -39,6 +39,12 @@ When mounting an XFS filesystem, the following options are accepted.
        drive level write caching to be enabled, for devices that
        support write barriers.
 
        drive level write caching to be enabled, for devices that
        support write barriers.
 

+  discard
+       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.
+

   dmapi
        Enable the DMAPI (Data Management API) event callouts.
        Use with the "mtpt" option.
   dmapi
        Enable the DMAPI (Data Management API) event callouts.
        Use with the "mtpt" option.