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: (43 commits)
  ext4: fix a BUG in mb_mark_used during trim.
  ext4: unused variables cleanup in fs/ext4/extents.c
  ext4: remove redundant set_buffer_mapped() in ext4_da_get_block_prep()
  ext4: add more tracepoints and use dev_t in the trace buffer
  ext4: don't kfree uninitialized s_group_info members
  ext4: add missing space in printk's in __ext4_grp_locked_error()
  ext4: add FITRIM to compat_ioctl.
  ext4: handle errors in ext4_clear_blocks()
  ext4: unify the ext4_handle_release_buffer() api
  ext4: handle errors in ext4_rename
  jbd2: add COW fields to struct jbd2_journal_handle
  jbd2: add the b_cow_tid field to journal_head struct
  ext4: Initialize fsync transaction ids in ext4_new_inode()
  ext4: Use single thread to perform DIO unwritten convertion
  ext4: optimize ext4_bio_write_page() when no extent conversion is needed
  ext4: skip orphan cleanup if fs has unknown ROCOMPAT features
  ext4: use the nblocks arg to ext4_truncate_restart_trans()
  ext4: fix missing iput of root inode for some mount error paths
  ext4: make FIEMAP and delayed allocation play well together
  ext4: suppress verbose debugging information if malloc-debug is off
  ...

Fi up conflicts in fs/ext4/super.c due to workqueue changes

21 files changed, 1307 insertions, 599 deletions

diff --git a/Documentation/ABI/testing/sysfs-fs-ext4 b/Documentation/ABI/testing/sysfs-fs-ext4
index 5fb709997d96..f22ac0872ae8 100644
--- a/Documentation/ABI/testing/sysfs-fs-ext4
+++ b/Documentation/ABI/testing/sysfs-fs-ext4
@@ -48,7 +48,7 @@ Description:
                  will have its blocks allocated out of its own unique
                  preallocation pool.
 
-What:           /sys/fs/ext4/<disk>/inode_readahead
+What:           /sys/fs/ext4/<disk>/inode_readahead_blks
 Date:           March 2008
 Contact:        "Theodore Ts'o" <tytso@mit.edu>
 Description:
@@ -85,7 +85,14 @@ Date:		June 2008
 Contact:        "Theodore Ts'o" <tytso@mit.edu>
 Description:
                 Tuning parameter which (if non-zero) controls the goal
-                inode used by the inode allocator in p0reference to
-                all other allocation hueristics.  This is intended for
+                inode used by the inode allocator in preference to
+                all other allocation heuristics.  This is intended for
                 debugging use only, and should be 0 on production
                 systems.
+
+What:           /sys/fs/ext4/<disk>/max_writeback_mb_bump
+Date:           September 2009
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                The maximum number of megabytes the writeback code will
+                try to write out before move on to another inode.
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 6ab9442d7eeb..6b050464a90d 100644
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -367,12 +367,47 @@ init_itable=n		The lazy itable init code will wait n times the
                         minimizes the impact on the systme performance
                         while file system's inode table is being initialized.
 
-discard         Controls whether ext4 should issue discard/TRIM
+discard                 Controls whether ext4 should issue discard/TRIM
 nodiscard(*)            commands to the underlying block device when
                         blocks are freed.  This is useful for SSD devices
                         and sparse/thinly-provisioned LUNs, but it is off
                         by default until sufficient testing has been done.
 
+nouid32                 Disables 32-bit UIDs and GIDs.  This is for
+                        interoperability  with  older kernels which only
+                        store and expect 16-bit values.
+
+resize                  Allows to resize filesystem to the end of the last
+                        existing block group, further resize has to be done
+                        with resize2fs either online, or offline. It can be
+                        used only with conjunction with remount.
+
+block_validity          This options allows to enables/disables the in-kernel
+noblock_validity        facility for tracking filesystem metadata blocks
+                        within internal data structures. This allows multi-
+                        block allocator and other routines to quickly locate
+                        extents which might overlap with filesystem metadata
+                        blocks. This option is intended for debugging
+                        purposes and since it negatively affects the
+                        performance, it is off by default.
+
+dioread_lock            Controls whether or not ext4 should use the DIO read
+dioread_nolock          locking. If the dioread_nolock option is specified
+                        ext4 will allocate uninitialized extent before buffer
+                        write and convert the extent to initialized after IO
+                        completes. This approach allows ext4 code to avoid
+                        using inode mutex, which improves scalability on high
+                        speed storages. However this does not work with nobh
+                        option and the mount will fail. Nor does it work with
+                        data journaling and dioread_nolock option will be
+                        ignored with kernel warning. Note that dioread_nolock
+                        code path is only used for extent-based files.
+                        Because of the restrictions this options comprises
+                        it is off by default (e.g. dioread_lock).
+
+i_version               Enable 64-bit inode version support. This option is
+                        off by default.
+
 Data Mode
 =========
 There are 3 different data modes:
@@ -400,6 +435,176 @@ needs to be read from and written to disk at the same time where it
 outperforms all others modes.  Currently ext4 does not have delayed
 allocation support if this data journalling mode is selected.
 
+/proc entries
+=============
+
+Information about mounted ext4 file systems can be found in
+/proc/fs/ext4.  Each mounted filesystem will have a directory in
+/proc/fs/ext4 based on its device name (i.e., /proc/fs/ext4/hdc or
+/proc/fs/ext4/dm-0).   The files in each per-device directory are shown
+in table below.
+
+Files in /proc/fs/ext4/<devname>
+..............................................................................
+ File            Content
+ mb_groups       details of multiblock allocator buddy cache of free blocks
+..............................................................................
+
+/sys entries
+============
+
+Information about mounted ext4 file systems can be found in
+/sys/fs/ext4.  Each mounted filesystem will have a directory in
+/sys/fs/ext4 based on its device name (i.e., /sys/fs/ext4/hdc or
+/sys/fs/ext4/dm-0).   The files in each per-device directory are shown
+in table below.
+
+Files in /sys/fs/ext4/<devname>
+(see also Documentation/ABI/testing/sysfs-fs-ext4)
+..............................................................................
+ File                         Content
+
+ delayed_allocation_blocks    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.
+
+ inode_goal                   Tuning parameter which (if non-zero) controls
+                              the goal inode used by the inode allocator in
+                              preference to all other allocation heuristics.
+                              This is intended for debugging use only, and
+                              should be 0 on production systems.
+
+ inode_readahead_blks         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
+
+ lifetime_write_kbytes        This file is read-only and shows the number of
+                              kilobytes of data that have been written to this
+                              filesystem since it was created.
+
+ max_writeback_mb_bump        The maximum number of megabytes the writeback
+                              code will try to write out before move on to
+                              another inode.
+