From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 21 May 2010 19:27:26 +0000 (+0200)
Subject: Merge branch 'master' into for-2.6.35
X-Git-Tag: v2.6.35-rc1~442^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ee9a3607fb03e804ddf624544105f4e34260c380;p=linux.git

Merge branch 'master' into for-2.6.35

Conflicts:
	fs/ext3/fsync.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

ee9a3607fb03e804ddf624544105f4e34260c380
diff --cc fs/ext3/fsync.c
index 9492f6003ef9,26289e8f4163..fcf7487734b6
--- a/fs/ext3/fsync.c
+++ b/fs/ext3/fsync.c
@@@ -90,9 -89,7 +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;
  }