diff --git a/[refs] b/[refs]
index 2d4cf5b005f5..87aea282780c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67a5da564f97f31c4054d358e00b34d7ee570da5
+refs/heads/master: 316e4cfd0b0b4ce846fd0fbda2deebcffbd3e440
diff --git a/trunk/fs/jbd2/recovery.c b/trunk/fs/jbd2/recovery.c
index 0131e4362534..626846bac32f 100644
--- a/trunk/fs/jbd2/recovery.c
+++ b/trunk/fs/jbd2/recovery.c
@@ -289,8 +289,11 @@ int jbd2_journal_recover(journal_t *journal)
 	if (!err)
 		err = err2;
 	/* Make sure all replayed data is on permanent storage */
-	if (journal->j_flags & JBD2_BARRIER)
-		blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);
+	if (journal->j_flags & JBD2_BARRIER) {
+		err2 = blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);
+		if (!err)
+			err = err2;
+	}
 	return err;
 }