Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (33 commits)
  ext4: Regularize mount options
  ext4: fix locking typo in mballoc which could cause soft lockup hangs
  ext4: fix typo which causes a memory leak on error path
  jbd2: Update locking coments
  ext4: Rename pa_linear to pa_type
  ext4: add checks of block references for non-extent inodes
  ext4: Check for an valid i_mode when reading the inode from disk
  ext4: Use WRITE_SYNC for commits which are caused by fsync()
  ext4: Add auto_da_alloc mount option
  ext4: Use struct flex_groups to calculate get_orlov_stats()
  ext4: Use atomic_t's in struct flex_groups
  ext4: remove /proc tuning knobs
  ext4: Add sysfs support
  ext4: Track lifetime disk writes
  ext4: Fix discard of inode prealloc space with delayed allocation.
  ext4: Automatically allocate delay allocated blocks on rename
  ext4: Automatically allocate delay allocated blocks on close
  ext4: add EXT4_IOC_ALLOC_DA_BLKS ioctl
  ext4: Simplify delalloc code by removing mpage_da_writepages()
  ext4: Save stack space by removing fake buffer heads
  ...

1 files changed, 81 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-fs-ext4 b/Documentation/ABI/testing/sysfs-fs-ext4
new file mode 100644
index 000000000000..4e79074de282
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-fs-ext4
@@ -0,0 +1,81 @@
+What:           /sys/fs/ext4/<disk>/mb_stats
+Date:           March 2008
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                 Controls whether the multiblock allocator should
+                 collect statistics, which are shown during the unmount.
+                 1 means to collect statistics, 0 means not to collect
+                 statistics
+
+What:           /sys/fs/ext4/<disk>/mb_group_prealloc
+Date:           March 2008
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                The multiblock allocator will round up allocation
+                requests to a multiple of this tuning parameter if the
+                stripe size is not set in the ext4 superblock
+
+What:           /sys/fs/ext4/<disk>/mb_max_to_scan
+Date:           March 2008
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                The maximum number of extents the multiblock allocator
+                will search to find the best extent
+
+What:           /sys/fs/ext4/<disk>/mb_min_to_scan
+Date:           March 2008
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                The minimum number of extents the multiblock allocator
+                will search to find the best extent
+
+What:           /sys/fs/ext4/<disk>/mb_order2_req
+Date:           March 2008
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                Tuning parameter which controls the minimum size for 
+                requests (as a power of 2) where the buddy cache is
+                used
+
+What:           /sys/fs/ext4/<disk>/mb_stream_req
+Date:           March 2008
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                Files which have fewer blocks than this tunable
+                parameter will have their blocks allocated out of a
+                block group specific preallocation pool, so that small
+                files are packed closely together.  Each large file
+                 will have its blocks allocated out of its own unique
+                 preallocation pool.
+
+What:           /sys/fs/ext4/<disk>/inode_readahead
+Date:           March 2008
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                Tuning parameter which controls the maximum number of
+                inode table blocks that ext4's inode table readahead
+                algorithm will pre-read into the buffer cache
+
+What:           /sys/fs/ext4/<disk>/delayed_allocation_blocks
+Date:           March 2008
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                This file is read-only and shows the number of blocks
+                that are dirty in the page cache, but which do not
+                have their location in the filesystem allocated yet.
+
+What:           /sys/fs/ext4/<disk>/lifetime_write_kbytes
+Date:           March 2008
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                This file is read-only and shows the number of kilobytes
+                of data that have been written to this filesystem since it was
+                created.
+
+What:           /sys/fs/ext4/<disk>/session_write_kbytes
+Date:           March 2008
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                This file is read-only and shows the number of
+                kilobytes of data that have been written to this
+                filesystem since it was mounted.