lib/{e2p,ss}: remove manual declarations of errno

[tools/e2fsprogs.git] / debugfs / journal.c

diff --git a/debugfs/journal.c b/debugfs/journal.c
index fa72ec5..5bac0d3 100644 (file)
--- a/debugfs/journal.c
+++ b/debugfs/journal.c
@@ -26,9 +26,7 @@
 #include "uuid/uuid.h"
 #include "journal.h"
 
-#ifdef CONFIG_JBD_DEBUG                /* Enabled by configure --enable-jfs-debug */
 static int bh_count = 0;
-#endif
 
 #if EXT2_FLAT_INCLUDES
 #include "blkid.h"
@@ -135,10 +133,8 @@ struct buffer_head *getblk(kdev_t kdev, unsigned long long blocknr,
        if (retval)
                return NULL;
 
-#ifdef CONFIG_JBD_DEBUG
        if (journal_enable_debug >= 3)
                bh_count++;
-#endif
        jfs_debug(4, "getblk for block %llu (%d bytes)(total %d)\n",
                  blocknr, blocksize, bh_count);
 
@@ -165,7 +161,8 @@ int sync_blockdev(kdev_t kdev)
        return io_channel_flush(io) ? EIO : 0;
 }
 
-void ll_rw_block(int rw, int op_flags, int nr, struct buffer_head *bhp[])
+void ll_rw_block(int rw, int op_flags EXT2FS_ATTR((unused)), int nr,
+                struct buffer_head *bhp[])
 {
        errcode_t retval;
        struct buffer_head *bh;
@@ -378,7 +375,7 @@ try_backup_journal:
                                goto errout;
                }
 
-               journal->j_maxlen = EXT2_I_SIZE(&j_inode->i_ext2) /
+               journal->j_total_len = EXT2_I_SIZE(&j_inode->i_ext2) /
                        journal->j_blocksize;
 
 #ifdef USE_INODE_IO
@@ -493,7 +490,7 @@ try_backup_journal:
                brelse(bh);
 
                maxlen = ext2fs_blocks_count(&jsuper);
-               journal->j_maxlen = (maxlen < 1ULL << 32) ? maxlen :
+               journal->j_total_len = (maxlen < 1ULL << 32) ? maxlen :
                                    (1ULL << 32) - 1;
                start++;
        }
@@ -629,9 +626,9 @@ static errcode_t ext2fs_journal_load(journal_t *journal)
        if (jsb->s_blocksize != htonl(journal->j_blocksize))
                return EXT2_ET_CORRUPT_JOURNAL_SB;
 
-       if (ntohl(jsb->s_maxlen) < journal->j_maxlen)
-               journal->j_maxlen = ntohl(jsb->s_maxlen);
-       else if (ntohl(jsb->s_maxlen) > journal->j_maxlen)
+       if (ntohl(jsb->s_maxlen) < journal->j_total_len)
+               journal->j_total_len = ntohl(jsb->s_maxlen);
+       else if (ntohl(jsb->s_maxlen) > journal->j_total_len)
                return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        journal->j_tail_sequence = ntohl(jsb->s_sequence);
@@ -772,6 +769,8 @@ static errcode_t recover_ext3_journal(ext2_filsys fs)
                mark_buffer_dirty(journal->j_sb_buffer);
        }
 
+       journal->j_tail_sequence = journal->j_transaction_sequence;
+
 errout:
        jbd2_journal_destroy_revoke(journal);
        jbd2_journal_destroy_revoke_record_cache();