From 20bb0ccc59fdc0deb1bc682a07ec880a93e6836c Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 9 Jul 2012 23:38:36 +0200 Subject: [PATCH] --- yaml --- r: 316704 b: refs/heads/master c: 349ecd6a3c0e4f97fa4dc6bd3917455ccc106d23 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd/recovery.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eedacbc4622f..476f685b4951 100644 --- 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 index 008bf062fd26..a748fe21465a 100644 --- 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; }