Merge branch 'cleanup' into for-linus

[firefly-linux-kernel-4.4.55.git] / fs / jbd / recovery.c

diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c
index 008bf062fd26e1bdfe0de195159c66aeb9fa1aab..a748fe21465abd1a6d8d478fc1fd93b4d9ce335a 100644 (file)
--- a/fs/jbd/recovery.c
+++ b/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;
 }