Remove unused variables

Signed-off-by: Eric Sandeen <esandeen@redhat.com>

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 3e7b510d90d2310eafa67e136ad6f9548855ba3e..d2e2e2971208fcedeae21864359e0359f970aa5e 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-30  Eric Sandeen <esandeen@redhat.com>
+
+       * pass1.c (handle_fs_bad_blocks): Remove unused variables.
+
 2006-08-30  Eric Sandeen <esandeen@redhat.com>
 
        * pass1b.c (check_if_fs_block): Change block group loop to use 

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 605a9eaa8fc58b639593594779a41a1c553f0b99..40654662498e1158a34ffad5c4a5734831d24f5f 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -1981,14 +1981,13 @@ static void handle_fs_bad_blocks(e2fsck_t ctx)
 static void mark_table_blocks(e2fsck_t ctx)
 {
        ext2_filsys fs = ctx->fs;
-       blk_t   block, b;
+       blk_t   b;
        dgrp_t  i;
        int     j;
        struct problem_context pctx;
        
        clear_problem_context(&pctx);
        
-       block = fs->super->s_first_data_block;
        for (i = 0; i < fs->group_desc_count; i++) {
                pctx.group = i;
 
@@ -2049,7 +2048,6 @@ static void mark_table_blocks(e2fsck_t ctx)
                                     fs->group_desc[i].bg_inode_bitmap);
                        }
                }
-               block += fs->super->s_blocks_per_group;
        }
 }
        

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 124b6c16655384f49374dd8a679f61d002e7e859..179d4062b3ceb1750d8c05d998c3f9a284ded732 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-30  Eric Sandeen <esandeen@redhat.com>
+
+       * closefs.c (write_backup_super):
+       * initialize.c (ext2fs_initialize): Remove unused variables.
+
 2006-08-30  Eric Sandeen <esandeen@redhat.com>
 
        * check_desc.c (ext2fs_check_desc): avoid overflows when iterating

diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c
index 58f1a8b1d44f04d2f564ad6719c9dbe5c4dcb638..474e00e07285904ea36b50e9ae4747838b788555 100644 (file)
--- a/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@ -206,7 +206,6 @@ static errcode_t write_backup_super(ext2_filsys fs, dgrp_t group,
 errcode_t ext2fs_flush(ext2_filsys fs)
 {
        dgrp_t          i,j;
-       blk_t           group_block;
        errcode_t       retval;
        unsigned long   fs_state;
        struct ext2_super_block *super_shadow = 0;
@@ -275,7 +274,6 @@ errcode_t ext2fs_flush(ext2_filsys fs)
         * Write out the master group descriptors, and the backup
         * superblocks and group descriptors.
         */
-       group_block = fs->super->s_first_data_block;
        group_ptr = (char *) group_shadow;
        if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
                old_desc_blocks = fs->super->s_first_meta_bg;

diff --git a/lib/ext2fs/initialize.c b/lib/ext2fs/initialize.c
index 6b476d9809add3020f5726b47f8829893655e6ba..ed68b42296360857ce1e8eb18361a76d857c50e7 100644 (file)
--- a/lib/ext2fs/initialize.c
+++ b/lib/ext2fs/initialize.c
@@ -99,7 +99,6 @@ errcode_t ext2fs_initialize(const char *name, int flags,
        int             frags_per_block;
        unsigned int    rem;
        unsigned int    overhead = 0;
-       blk_t           group_block;
        unsigned int    ipg;
        dgrp_t          i;
        blk_t           numblocks;
@@ -360,7 +359,6 @@ retry:
         * inode table have not been allocated (and in fact won't be
         * by this routine), they are accounted for nevertheless.
         */
-       group_block = super->s_first_data_block;
        super->s_free_blocks_count = 0;
        for (i = 0; i < fs->group_desc_count; i++) {
                numblocks = ext2fs_reserve_super_and_bgd(fs, i, fs->block_map);
@@ -370,8 +368,6 @@ retry:
                fs->group_desc[i].bg_free_inodes_count =
                        fs->super->s_inodes_per_group;
                fs->group_desc[i].bg_used_dirs_count = 0;
-               
-               group_block += super->s_blocks_per_group;
        }
        
        ext2fs_mark_super_dirty(fs);

diff --git a/misc/ChangeLog b/misc/ChangeLog
index a49a563637c739b360a470d730d36c93cac07157..0a5c495945dd554e7e746d31073757118aa30d08 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-30  Eric Sandeen <esandeen@redhat.com>
+
+       * e2image.c (mark_table_blocks): Remove unused first_block
+               incrementing from loop.
+
 2006-08-30  Eric Sandeen <esandeen@redhat.com>
 
        * dumpe2fs.c (list_desc, mark_table_blocks): Avoid overflows when

diff --git a/misc/e2image.c b/misc/e2image.c
index c069b0cf83a00b0266eae497780b10c63773f802..59bf1e46091a9c729d15ce287044557a90413793 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -287,7 +287,6 @@ static void mark_table_blocks(ext2_filsys fs)
                        ext2fs_mark_block_bitmap(meta_block_map,
                                 fs->group_desc[i].bg_inode_bitmap);
                }
-               first_block += fs->super->s_blocks_per_group;
        }
 }
 

diff --git a/resize/ChangeLog b/resize/ChangeLog
index b1c0794bf538cb289cf82bec0aa84bfafe71699e..4aaec3667721a7f554c555be773ea1ae031af3a6 100644 (file)
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-30  Eric Sandeen  <esandeen@redhat.com>
+
+       * resize2fs.c (mark_table_blocks): Remove unused variable.
+
 2006-08-30  Theodore Tso  <tytso@mit.edu>
 
        * resize2fs.c (adjust_fs_info), online.c (online_resize_fs): Use

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 7d3bde90f94543ee4c982b9559c81839b2f50331..e9d0fb5bb1e77ee6526556b7fbc4906649268ab3 100644 (file)
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -536,14 +536,13 @@ errout:
 static errcode_t mark_table_blocks(ext2_filsys fs,
                                   ext2fs_block_bitmap bmap)
 {
-       blk_t                   block, b;
+       blk_t                   b;
        unsigned int            j;
        dgrp_t                  i;
        unsigned long           meta_bg_size;
        unsigned int            old_desc_blocks;
 
        meta_bg_size = (fs->blocksize / sizeof (struct ext2_group_desc));
-       block = fs->super->s_first_data_block;
        if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
                old_desc_blocks = fs->super->s_first_meta_bg;
        else
@@ -571,7 +570,6 @@ static errcode_t mark_table_blocks(ext2_filsys fs,
                 */
                ext2fs_mark_block_bitmap(bmap,
                                         fs->group_desc[i].bg_inode_bitmap);
-               block += fs->super->s_blocks_per_group;
        }
        return 0;
 }