diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-12-09 08:56:26 +0300 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-12-09 08:56:26 +0300 |
| commit | 9807b773dad4555665931d57065d7f8adab58e0f (patch) | |
| tree | 1475442200af6def0e03a792311dff151ef9f331 /Documentation | |
| parent | a444d72e609062a040ed95a50e8fccfa1d58281b (diff) | |
| parent | 9875258ca7ab238a08bb9ad17e0c9b9984eac7df (diff) | |
| download | linux-9807b773dad4555665931d57065d7f8adab58e0f.tar.xz | |
Merge branch 'xfs-4.10-misc-fixes-4' into for-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/xfs.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt index c2d44e6e117b..3b9b5c149f32 100644 --- a/Documentation/filesystems/xfs.txt +++ b/Documentation/filesystems/xfs.txt @@ -51,13 +51,6 @@ default behaviour. CRC enabled filesystems always use the attr2 format, and so will reject the noattr2 mount option if it is set. - barrier (*) - nobarrier - Enables/disables the use of block layer write barriers for - writes into the journal and for data integrity operations. - This allows for drive level write caching to be enabled, for - devices that support write barriers. - discard nodiscard (*) Enable/disable the issuing of commands to let the block @@ -228,7 +221,10 @@ default behaviour. Deprecated Mount Options ======================== -None at present. + Name Removal Schedule + ---- ---------------- + barrier no earlier than v4.15 + nobarrier no earlier than v4.15 Removed Mount Options |