jbd: fix error handling for checkpoint io

[linux-2.6-omap-h63xx.git] / fs / jbd / recovery.c

diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c
index 43bc5e5ed0648860aa4971f038bdc17c11142e6a..db5e982c5ddf44f5b442348a6c16f6001b7a8b4d 100644 (file)
--- a/fs/jbd/recovery.c
+++ b/fs/jbd/recovery.c
@@ -223,7 +223,7 @@ do {                                                                        \
  */
 int journal_recover(journal_t *journal)
 {
-       int                     err;
+       int                     err, err2;
        journal_superblock_t *  sb;
 
        struct recovery_info    info;
@@ -261,7 +261,10 @@ int journal_recover(journal_t *journal)
        journal->j_transaction_sequence = ++info.end_transaction;
 
        journal_clear_revoke(journal);
-       sync_blockdev(journal->j_fs_dev);
+       err2 = sync_blockdev(journal->j_fs_dev);
+       if (!err)
+               err = err2;
+
        return err;
 }