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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (45 commits)
  nilfs2: reject filesystem with unsupported block size
  nilfs2: avoid rec_len overflow with 64KB block size
  nilfs2: simplify nilfs_get_page function
  nilfs2: reject incompatible filesystem
  nilfs2: add feature set fields to super block
  nilfs2: clarify byte offset in super block format
  nilfs2: apply read-ahead for nilfs_btree_lookup_contig
  nilfs2: introduce check flag to btree node buffer
  nilfs2: add btree get block function with readahead option
  nilfs2: add read ahead mode to nilfs_btnode_submit_block
  nilfs2: fix buffer head leak in nilfs_btnode_submit_block
  nilfs2: eliminate inline keywords in btree implementation
  nilfs2: get maximum number of child nodes from bmap object
  nilfs2: reduce repetitive calculation of max number of child nodes
  nilfs2: optimize calculation of min/max number of btree node children
  nilfs2: remove redundant pointer checks in bmap lookup functions
  nilfs2: get rid of nilfs_bmap_union
  nilfs2: unify bmap set_target_v operations
  nilfs2: get rid of nilfs_btree uses
  nilfs2: get rid of nilfs_direct uses
  ...

1 files changed, 8 insertions, 4 deletions

diff --git a/Documentation/filesystems/nilfs2.txt b/Documentation/filesystems/nilfs2.txt
index d3e7673995eb..d5c0cef38a71 100644
--- a/Documentation/filesystems/nilfs2.txt
+++ b/Documentation/filesystems/nilfs2.txt
@@ -49,7 +49,10 @@ Mount options
 NILFS2 supports the following mount options:
 (*) == default
 
-nobarrier               Disables barriers.
+barrier(*)              This enables/disables the use of write barriers.  This
+nobarrier               requires an IO stack which can support barriers, and
+                        if nilfs gets an error on a barrier write, it will
+                        disable again with a warning.
 errors=continue         Keep going on a filesystem error.
 errors=remount-ro(*)    Remount the filesystem read-only on an error.
 errors=panic            Panic and halt the machine if an error occurs.
@@ -74,9 +77,10 @@ norecovery		Disable recovery of the filesystem on mount.
                         This disables every write access on the device for
                         read-only mounts or snapshots.  This option will fail
                         for r/w mounts on an unclean volume.
-discard                 Issue discard/TRIM commands to the underlying block
-                        device when blocks are freed.  This is useful for SSD
-                        devices and sparse/thinly-provisioned LUNs.
+discard                 This enables/disables the use of discard/TRIM commands.
+nodiscard(*)            The discard/TRIM commands are sent to the underlying
+                        block device when blocks are freed.  This is useful
+                        for SSD devices and sparse/thinly-provisioned LUNs.
 
 NILFS2 usage
 ============