Subject: linux-next: manual merge of the block tree with the ext3 tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 30 Apr 2010 12:46:34 +1000

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
fs/ext3/fsync.c between commit a74302d5d82ff478822c49b8345312b6fd5c6e0a
("ext3: Fix waiting on transaction during fsync") from the ext3 tree and
commit fbd9b09a177a481eda256447c881f014f29034fe ("blkdev: generalize
flags for blkdev_issue_fn functions") from the block tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc fs/ext3/fsync.c
index 26289e8,9492f60..0000000
--- a/fs/ext3/fsync.c
+++ b/fs/ext3/fsync.c
@@@ -89,7 -90,9 +89,8 @@@ int ext3_sync_file(struct file * file, 
  	 * disk caches manually so that data really is on persistent
  	 * storage
  	 */
 -	if (test_opt(inode->i_sb, BARRIER))
 +	if (needs_barrier)
- 		blkdev_issue_flush(inode->i_sb->s_bdev, NULL);
+ 		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL,
+ 				BLKDEV_IFL_WAIT);
 -out:
  	return ret;
  }