---

yaml --- r: 316705 b: refs/heads/master c: 44f4f72 h: refs/heads/master i: 316703: e573f98 v: v3
git-mirror · Jul 9, 2012 · 586204f · 586204f
1 parent 20bb0cc
commit 586204f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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;