From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Mar 2011 16:57:40 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
X-Git-Tag: v2.6.39-rc1~73
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=ae005cbed12d0b340b04b59d6f5c56e710b3895d

Merge branch 'for_linus' of git://git./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
---

ae005cbed12d0b340b04b59d6f5c56e710b3895d
diff --cc fs/ext4/super.c
index 203f9e4a70be,ccfa6865ea59..22546ad7f0ae
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@@ -3511,12 -3514,7 +3516,12 @@@ static int ext4_fill_super(struct super
  	percpu_counter_set(&sbi->s_dirtyblocks_counter, 0);
  
  no_journal:
 -	EXT4_SB(sb)->dio_unwritten_wq = create_singlethread_workqueue("ext4-dio-unwritten");
 +	/*
 +	 * The maximum number of concurrent works can be high and
 +	 * concurrency isn't really necessary.  Limit it to 1.
 +	 */
 +	EXT4_SB(sb)->dio_unwritten_wq =
- 		alloc_workqueue("ext4-dio-unwritten", WQ_MEM_RECLAIM, 1);
++		alloc_workqueue("ext4-dio-unwritten", WQ_MEM_RECLAIM | WQ_UNBOUND, 1);
  	if (!EXT4_SB(sb)->dio_unwritten_wq) {
  		printk(KERN_ERR "EXT4-fs: failed to create DIO workqueue\n");
  		goto failed_mount_wq;