From: Eric Sandeen <sandeen@redhat.com>
To: linux-ext4@vger.kernel.org
Cc: Eric Sandeen <sandeen@redhat.com>
Subject: [PATCH 12/25] e2fsck: Don't store old_op from ehandler_operation if we don't restore it.
Date: Fri, 16 Sep 2011 15:49:27 -0500 [thread overview]
Message-ID: <1316206180-6375-13-git-send-email-sandeen@redhat.com> (raw)
In-Reply-To: <1316206180-6375-1-git-send-email-sandeen@redhat.com>
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(-)
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)
--
1.7.4.1
next prev parent reply other threads:[~2011-09-16 20:49 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-16 20:49 [PATCH 00/25] e2fsprogs: Misc cleanups & fixes Eric Sandeen
2011-09-16 20:49 ` [PATCH 01/25] libext2: Fix EXT2_LIB_SOFTSUPP masking Eric Sandeen
2011-09-16 22:52 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 02/25] e2fsprogs: Remove impossible name_len tests Eric Sandeen
2011-09-16 22:30 ` Andreas Dilger
2011-09-16 22:52 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 03/25] fsck: fix -C option parsing Eric Sandeen
2011-09-16 22:52 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 04/25] mke2fs: remove impossible tests for null usage_types Eric Sandeen
2011-09-16 22:52 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 05/25] libext2: move buf variable completely under ifdef Eric Sandeen
2011-09-16 22:53 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 06/25] libext2fs: Potential null ptr deref in undo_err_handler_init Eric Sandeen
2011-09-16 22:53 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 07/25] e2fsck: handle null fs in print_pathname() Eric Sandeen
2011-09-16 22:53 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 08/25] e2fsprogs: annotate intentional fallthroughs in case statements Eric Sandeen
2011-09-16 22:53 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 09/25] uuidd: Add missing break to option case statement Eric Sandeen
2011-09-16 22:54 ` Ted Ts'o
2011-09-17 0:47 ` Eric Sandeen
2011-09-16 20:49 ` [PATCH 10/25] freefrag: fix up getopt " Eric Sandeen
2011-09-16 22:54 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 11/25] libe2p: reach unreachable code Eric Sandeen
2011-09-16 22:54 ` Ted Ts'o
2011-09-16 20:49 ` Eric Sandeen [this message]
2011-09-16 22:55 ` [PATCH 12/25] e2fsck: Don't store old_op from ehandler_operation if we don't restore it Ted Ts'o
2011-09-16 20:49 ` [PATCH 13/25] e2fsprogs: Fix some error cleanup path bugs Eric Sandeen
2011-09-16 22:55 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 14/25] subst: Fix free of uninit pointers Eric Sandeen
2011-09-16 22:56 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 15/25] filefrag: Fix uninitialized "expected" value Eric Sandeen
2011-09-16 22:56 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 16/25] e2fsck: remove extraneous memset Eric Sandeen
2011-09-16 22:56 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 17/25] mke2fs: Do not let -t or -T be specified more than once Eric Sandeen
2011-09-16 22:57 ` Ted Ts'o
2011-09-16 22:57 ` Ted Ts'o
2011-09-17 0:49 ` Eric Sandeen
2011-09-16 20:49 ` [PATCH 18/25] e2initrd_helper: Fix memory leak on error Eric Sandeen
2011-09-16 22:58 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 19/25] libext2: Fix leaks in write_bitmaps on error returns Eric Sandeen
2011-09-16 22:58 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 20/25] test_icount: fclose() before exit Eric Sandeen
2011-09-16 22:58 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 21/25] e2fsck: Fix leaks in error paths Eric Sandeen
2011-09-16 23:41 ` Ted Ts'o
2011-09-17 0:57 ` Eric Sandeen
2011-09-16 20:49 ` [PATCH 22/25] tune2fs: handle inode and/or block bitmap read failures in resize_inode() Eric Sandeen
2011-09-16 23:57 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 23/25] e2fsprogs: Don't try to close an fd which is negative Eric Sandeen
2011-09-16 23:57 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 24/25] e4defrag: Check error return of sysconf() Eric Sandeen
2011-09-16 23:57 ` Ted Ts'o
2011-09-16 20:49 ` [PATCH 25/25] mke2fs: free tdb_dir string if it came from the profile Eric Sandeen
2011-09-16 23:58 ` Ted Ts'o
2011-09-16 21:27 ` [PATCH 00/25] e2fsprogs: Misc cleanups & fixes Eric Sandeen
2011-09-16 22:05 ` Ted Ts'o
2011-09-16 22:27 ` Eric Sandeen
2011-09-16 23:49 ` Ted Ts'o
2011-09-17 0:58 ` Eric Sandeen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316206180-6375-13-git-send-email-sandeen@redhat.com \
--to=sandeen@redhat.com \
--cc=linux-ext4@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).