From 586204f0290732a4aaedac6abd21b2eda6f93bd6 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Mon, 9 Jul 2012 23:40:46 +0200
Subject: [PATCH] --- yaml --- r: 316705 b: refs/heads/master c:
 44f4f729e7a143b08bd63c33cb78b3181d9f4716 h: refs/heads/master i:   316703:
 e573f98c666663c60d0776b44b19b6d18104fa66 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext3/fsync.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 476f685b4951..86dc32737916 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 349ecd6a3c0e4f97fa4dc6bd3917455ccc106d23
+refs/heads/master: 44f4f729e7a143b08bd63c33cb78b3181d9f4716
diff --git a/trunk/fs/ext3/fsync.c b/trunk/fs/ext3/fsync.c
index d4dff278cbd8..b31dbd4c46ad 100644
--- a/trunk/fs/ext3/fsync.c
+++ b/trunk/fs/ext3/fsync.c
@@ -92,8 +92,13 @@ int ext3_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 	 * disk caches manually so that data really is on persistent
 	 * storage
 	 */
-	if (needs_barrier)
-		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
+	if (needs_barrier) {
+		int err;
+
+		err = blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
+		if (!ret)
+			ret = err;
+	}
 out:
 	trace_ext3_sync_file_exit(inode, ret);
 	return ret;