diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-06-06 23:39:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-06 23:39:26 -0700 |
| commit | 93a306aef5eef70e524500884ccca52c5dd19e17 (patch) | |
| tree | 13baf4c01c6cc86c5b5c1294fd0b9d05c85eedce /Documentation | |
| parent | net/macb: change RX path for GEM (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-93a306aef5eef70e524500884ccca52c5dd19e17.tar.xz linux-dev-93a306aef5eef70e524500884ccca52c5dd19e17.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' into 'net-next' to get the MSG_CMSG_COMPAT
regression fix.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/xfs.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt index 3e4b3dd1e046..83577f0232a0 100644 --- a/Documentation/filesystems/xfs.txt +++ b/Documentation/filesystems/xfs.txt @@ -33,6 +33,9 @@ When mounting an XFS filesystem, the following options are accepted. removing extended attributes) the on-disk superblock feature bit field will be updated to reflect this format being in use. + CRC enabled filesystems always use the attr2 format, and so + will reject the noattr2 mount option if it is set. + barrier Enables the use of block layer write barriers for writes into the journal and unwritten extent conversion. This allows for |