diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/filesystems/xfs.txt | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/filesystems/xfs.txt')
| -rw-r--r-- | Documentation/filesystems/xfs.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt index 7bff3e4f35df..3fc0c31a6f5d 100644 --- a/Documentation/filesystems/xfs.txt +++ b/Documentation/filesystems/xfs.txt | |||
| @@ -39,6 +39,12 @@ When mounting an XFS filesystem, the following options are accepted. | |||
| 39 | drive level write caching to be enabled, for devices that | 39 | drive level write caching to be enabled, for devices that |
| 40 | support write barriers. | 40 | support write barriers. |
| 41 | 41 | ||
| 42 | discard | ||
| 43 | Issue command to let the block device reclaim space freed by the | ||
| 44 | filesystem. This is useful for SSD devices, thinly provisioned | ||
| 45 | LUNs and virtual machine images, but may have a performance | ||
| 46 | impact. This option is incompatible with the nodelaylog option. | ||
| 47 | |||
| 42 | dmapi | 48 | dmapi |
| 43 | Enable the DMAPI (Data Management API) event callouts. | 49 | Enable the DMAPI (Data Management API) event callouts. |
| 44 | Use with the "mtpt" option. | 50 | Use with the "mtpt" option. |