---

yaml --- r: 316704 b: refs/heads/master c: 349ecd6 h: refs/heads/master v: v3
git-mirror · Jul 9, 2012 · 20bb0cc · 20bb0cc
1 parent e573f98
commit 20bb0cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17dc59ba418c3d6b0675d5b74d280acab2d4e369
+refs/heads/master: 349ecd6a3c0e4f97fa4dc6bd3917455ccc106d23
diff --git a/trunk/fs/jbd/recovery.c b/trunk/fs/jbd/recovery.c
@@ -265,8 +265,11 @@ int journal_recover(journal_t *journal)
 	if (!err)
 		err = err2;
 	/* Flush disk caches to get replayed data on the permanent storage */
-	if (journal->j_flags & JFS_BARRIER)
-		blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);
+	if (journal->j_flags & JFS_BARRIER) {
+		err2 = blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);
+		if (!err)
+			err = err2;
+	}
 
 	return err;
 }