diff options
Diffstat (limited to 'fs/jbd2/recovery.c')
| -rw-r--r-- | fs/jbd2/recovery.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c index 5d0405a9e7ca..058f50f65b76 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c | |||
| @@ -344,6 +344,7 @@ static int calc_chksums(journal_t *journal, struct buffer_head *bh, | |||
| 344 | *crc32_sum = crc32_be(*crc32_sum, (void *)obh->b_data, | 344 | *crc32_sum = crc32_be(*crc32_sum, (void *)obh->b_data, |
| 345 | obh->b_size); | 345 | obh->b_size); |
| 346 | } | 346 | } |
| 347 | put_bh(obh); | ||
| 347 | } | 348 | } |
| 348 | return 0; | 349 | return 0; |
| 349 | } | 350 | } |
| @@ -610,9 +611,8 @@ static int do_one_pass(journal_t *journal, | |||
| 610 | chksum_err = chksum_seen = 0; | 611 | chksum_err = chksum_seen = 0; |
| 611 | 612 | ||
| 612 | if (info->end_transaction) { | 613 | if (info->end_transaction) { |
| 613 | printk(KERN_ERR "JBD: Transaction %u " | 614 | journal->j_failed_commit = |
| 614 | "found to be corrupt.\n", | 615 | info->end_transaction; |
| 615 | next_commit_ID - 1); | ||
| 616 | brelse(bh); | 616 | brelse(bh); |
| 617 | break; | 617 | break; |
| 618 | } | 618 | } |
| @@ -643,10 +643,8 @@ static int do_one_pass(journal_t *journal, | |||
| 643 | 643 | ||
| 644 | if (!JBD2_HAS_INCOMPAT_FEATURE(journal, | 644 | if (!JBD2_HAS_INCOMPAT_FEATURE(journal, |
| 645 | JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT)){ | 645 | JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT)){ |
| 646 | printk(KERN_ERR | 646 | journal->j_failed_commit = |
| 647 | "JBD: Transaction %u " | 647 | next_commit_ID; |
| 648 | "found to be corrupt.\n", | ||
| 649 | next_commit_ID); | ||
| 650 | brelse(bh); | 648 | brelse(bh); |
| 651 | break; | 649 | break; |
| 652 | } | 650 | } |