author: Joseph Qi <joseph.qi@huawei.com> 2015-06-15 14:36:01 -0400
committer: Theodore Ts'o <tytso@mit.edu> 2015-06-15 14:36:01 -0400
commit: 6f6a6fda294506dfe0e3e0a253bb2d2923f28f0a
parent: 97b4af2f7672476eedeb5cf5000b927ed4b516a4
Commit Summary:
Diffstat:
1 file changed, 2 insertions, 3 deletions
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index 6b7b73afef81..4227dc4f7437 100644
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -390,7 +390,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
unsigned long blocknr;
if (is_journal_aborted(journal))
- return 1;
+ return -EIO;
if (!jbd2_journal_get_log_tail(journal, &first_tid, &blocknr))
return 1;
@@ -407,8 +407,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
if (journal->j_flags & JBD2_BARRIER)
blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS, NULL);
- __jbd2_update_log_tail(journal, first_tid, blocknr);
- return 0;
+ return __jbd2_update_log_tail(journal, first_tid, blocknr);
}