Whamcloud - gitweb
e2fsck: Don't store old_op from ehandler_operation if we don't restore it.
authorEric Sandeen <sandeen@redhat.com>
Fri, 16 Sep 2011 20:49:27 +0000 (15:49 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 16 Sep 2011 22:43:05 +0000 (18:43 -0400)
old_op is set but never used, because we restore "0"
not old_op.  So don't bother with it.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
e2fsck/pass1.c
e2fsck/pass2.c

index 16ddcda..4c3fe3f 100644 (file)
@@ -402,7 +402,6 @@ static void check_is_really_dir(e2fsck_t ctx, struct problem_context *pctx,
 {
        struct ext2_inode *inode = pctx->inode;
        struct ext2_dir_entry   *dirent;
-       const char              *old_op;
        errcode_t               retval;
        blk64_t                 blk;
        unsigned int            i, rec_len, not_device = 0;
@@ -472,7 +471,7 @@ static void check_is_really_dir(e2fsck_t ctx, struct problem_context *pctx,
                return;
 
        /* read the first block */
-       old_op = ehandler_operation(_("reading directory block"));
+       ehandler_operation(_("reading directory block"));
        retval = ext2fs_read_dir_block3(ctx->fs, blk, buf, 0);
        ehandler_operation(0);
        if (retval)
index 9c44aa2..43ba5b2 100644 (file)
@@ -711,7 +711,6 @@ static int check_dir_block(ext2_filsys fs,
        struct ext2_dir_entry   *dirent, *prev;
        ext2_dirhash_t          hash;
        unsigned int            offset = 0;
-       const char *            old_op;
        int                     dir_modified = 0;
        int                     dot_state;
        unsigned int            rec_len;
@@ -774,7 +773,7 @@ static int check_dir_block(ext2_filsys fs,
               db->blockcnt, ino);
 #endif
 
-       old_op = ehandler_operation(_("reading directory block"));
+       ehandler_operation(_("reading directory block"));
        cd->pctx.errcode = ext2fs_read_dir_block3(fs, block_nr, buf, 0);
        ehandler_operation(0);
        if (cd->pctx.errcode == EXT2_ET_DIR_CORRUPTED)