Patchwork [12/25] e2fsck: Don't store old_op from ehandler_operation if we don't restore it.

login
register
mail settings
Submitter Eric Sandeen
Date Sept. 16, 2011, 8:49 p.m.
Message ID <1316206180-6375-13-git-send-email-sandeen@redhat.com>
Download mbox | patch
Permalink /patch/115049/
State Accepted
Headers show

Comments

Eric Sandeen - Sept. 16, 2011, 8:49 p.m.
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>
---
 e2fsck/pass1.c |    3 +--
 e2fsck/pass2.c |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
Theodore Ts'o - Sept. 16, 2011, 10:55 p.m.
On Fri, Sep 16, 2011 at 03:49:27PM -0500, Eric Sandeen wrote:
> 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>

Applied, thanks.

				- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 16ddcda..4c3fe3f 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -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)
diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index 9c44aa2..43ba5b2 100644
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -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)