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

1 files changed, 10 insertions, 3 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.