]> www.infradead.org Git - users/hch/xfsprogs.git/commitdiff
xfs_repair: remove impossible tests in process_sf_dir2
authorEric Sandeen <sandeen@redhat.com>
Mon, 6 Apr 2015 23:19:59 +0000 (09:19 +1000)
committerDave Chinner <david@fromorbit.com>
Mon, 6 Apr 2015 23:19:59 +0000 (09:19 +1000)
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 <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
repair/dir2.c

index 25793e90a903dc6ff142a1c8d91ac9a59f3e6fa1..7aede6a23f27668e268dd6245578fc2847da5be5 100644 (file)
@@ -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;
                        }
                }