From 1633febd85a77a88512f216da5d804f24cd64d86 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 7 Apr 2015 09:19:59 +1000 Subject: [PATCH] xfs_repair: remove impossible tests in process_sf_dir2 We're testing for an impossible case in here: if (i == num_entries - 1) { ... } else { ... if (i == num_entries - 1) /* can't happen! */ ... } So, remove the impossible case. Signed-off-by: Eric Sandeen Reviewed-by: Brian Foster Signed-off-by: Dave Chinner --- repair/dir2.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/repair/dir2.c b/repair/dir2.c index 25793e90a..7aede6a23 100644 --- a/repair/dir2.c +++ b/repair/dir2.c @@ -928,26 +928,12 @@ _("size of last entry overflows space left in in shortform dir %" PRIu64 ", "), do_warn( _("size of entry #%d overflows space left in in shortform dir %" PRIu64 "\n"), i, ino); - if (!no_modify) { - if (i == num_entries - 1) - do_warn( - _("junking entry #%d\n"), - i); - else - do_warn( - _("junking %d entries\n"), - num_entries - i); - } else { - if (i == num_entries - 1) - do_warn( - _("would junk entry #%d\n"), - i); - else - do_warn( - _("would junk %d entries\n"), - num_entries - i); - } - + if (!no_modify) + do_warn(_("junking %d entries\n"), + num_entries - i); + else + do_warn(_("would junk %d entries\n"), + num_entries - i); break; } } -- 2.47.2