repair: add canonical names for the XR_INO_ constants

Add an array with the canonical name for each inode type so that code
doesn't have to implement switch statements for that, and remove the now
trivial process_misc_ino_types and process_misc_ino_types_blocks
functions.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/repair/dinode.c b/repair/dinode.c
index b824dfc0a59fd5ad3862bfa0bdac9c36ad5012c3..7f987c38d2e4ab3c8fca3cb0b0183c04614e311d 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -41,8 +41,29 @@ enum xr_ino_type {
        XR_INO_PQUOTA,          /* project quota inode */
        XR_INO_RTRMAP,          /* realtime rmap */
        XR_INO_RTREFC,          /* realtime refcount */
+       XR_INO_MAX
 };
 
+static const char *xr_ino_type_name[] = {
+       [XR_INO_UNKNOWN]        = N_("unknown"),
+       [XR_INO_DIR]            = N_("directory"),
+       [XR_INO_RTDATA]         = N_("realtime file"),
+       [XR_INO_RTBITMAP]       = N_("realtime bitmap"),
+       [XR_INO_RTSUM]          = N_("realtime summary"),
+       [XR_INO_DATA]           = N_("regular file"),
+       [XR_INO_SYMLINK]        = N_("symlink"),
+       [XR_INO_CHRDEV]         = N_("character device"),
+       [XR_INO_BLKDEV]         = N_("block device"),
+       [XR_INO_SOCK]           = N_("socket"),
+       [XR_INO_FIFO]           = N_("fifo"),
+       [XR_INO_UQUOTA]         = N_("user quota"),
+       [XR_INO_GQUOTA]         = N_("group quota"),
+       [XR_INO_PQUOTA]         = N_("project quota"),
+       [XR_INO_RTRMAP]         = N_("realtime rmap"),
+       [XR_INO_RTREFC]         = N_("realtime refcount"),
+};
+static_assert(ARRAY_SIZE(xr_ino_type_name) == XR_INO_MAX);
+
 /*
  * gettext lookups for translations of strings use mutexes internally to
  * the library. Hence when we come through here doing parallel scans in
@@ -1946,106 +1967,6 @@ _("found illegal null character in symlink inode %" PRIu64 "\n"),
        return(0);
 }
 
-/*
- * called to process the set of misc inode special inode types
- * that have no associated data storage (fifos, pipes, devices, etc.).
- */
-static int
-process_misc_ino_types(
-       xfs_mount_t             *mp,
-       struct xfs_dinode       *dino,
-       xfs_ino_t               lino,
-       enum xr_ino_type        type)
-{
-       /*
-        * must also have a zero size
-        */
-       if (be64_to_cpu(dino->di_size) != 0)  {
-               switch (type)  {
-               case XR_INO_CHRDEV:
-                       do_warn(
-_("size of character device inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino,
-                               (int64_t)be64_to_cpu(dino->di_size));
-                       break;
-               case XR_INO_BLKDEV:
-                       do_warn(
-_("size of block device inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino,
-                               (int64_t)be64_to_cpu(dino->di_size));
-                       break;
-               case XR_INO_SOCK:
-                       do_warn(
-_("size of socket inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino,
-                               (int64_t)be64_to_cpu(dino->di_size));
-                       break;
-               case XR_INO_FIFO:
-                       do_warn(
-_("size of fifo inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino,
-                               (int64_t)be64_to_cpu(dino->di_size));
-                       break;
-               case XR_INO_UQUOTA:
-               case XR_INO_GQUOTA:
-               case XR_INO_PQUOTA:
-                       do_warn(
-_("size of quota inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino,
-                               (int64_t)be64_to_cpu(dino->di_size));
-                       break;
-               default:
-                       do_warn(_("Internal error - process_misc_ino_types, "
-                                 "illegal type %d\n"), type);
-                       abort();
-               }
-
-               return(1);
-       }
-
-       return(0);
-}
-
-static int
-process_misc_ino_types_blocks(
-       xfs_rfsblock_t          totblocks,
-       xfs_ino_t               lino,
-       enum xr_ino_type        type)
-{
-       /*
-        * you can not enforce all misc types have zero data fork blocks
-        * by checking dino->di_nblocks because atotblocks (attribute
-        * blocks) are part of nblocks. We must check this later when atotblocks
-        * has been calculated or by doing a simple check that anExtents == 0.
-        * We must also guarantee that totblocks is 0. Thus nblocks checking
-        * will be done later in process_dinode_int for misc types.
-        */
-
-       if (totblocks != 0)  {
-               switch (type)  {
-               case XR_INO_CHRDEV:
-                       do_warn(
-_("size of character device inode %" PRIu64 " != 0 (%" PRIu64 " blocks)\n"),
-                               lino, totblocks);
-                       break;
-               case XR_INO_BLKDEV:
-                       do_warn(
-_("size of block device inode %" PRIu64 " != 0 (%" PRIu64 " blocks)\n"),
-                               lino, totblocks);
-                       break;
-               case XR_INO_SOCK:
-                       do_warn(
-_("size of socket inode %" PRIu64 " != 0 (%" PRIu64 " blocks)\n"),
-                               lino, totblocks);
-                       break;
-               case XR_INO_FIFO:
-                       do_warn(
-_("size of fifo inode %" PRIu64 " != 0 (%" PRIu64 " blocks)\n"),
-                               lino, totblocks);
-                       break;
-               default:
-                       return(0);
-               }
-               return(1);
-       }
-       return (0);
-}
-
 static inline int
 dinode_fmt(
        struct xfs_dinode *dino)
@@ -2261,16 +2182,20 @@ _("directory inode %" PRIu64 " has bad size %" PRId64 "\n"),
        case XR_INO_BLKDEV:
        case XR_INO_SOCK:
        case XR_INO_FIFO:
-               if (process_misc_ino_types(mp, dino, lino, type))
-                       return 1;
-               break;
-
        case XR_INO_UQUOTA:
        case XR_INO_GQUOTA:
        case XR_INO_PQUOTA:
-               /* Quota inodes have same restrictions as above types */
-               if (process_misc_ino_types(mp, dino, lino, type))
+               /*
+                * Misc inode types that have no associated data storage (fifos,
+                * pipes, devices, etc.) and thus must also have a zero size.
+                */
+               if (dino->di_size != 0)  {
+                       do_warn(
+_("size of %s inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"),
+                               _(xr_ino_type_name[type]), lino,
+                               (int64_t)be64_to_cpu(dino->di_size));
                        return 1;
+               }
                break;
 
        case XR_INO_RTDATA:
@@ -3704,10 +3629,26 @@ _("bad (negative) size %" PRId64 " on inode %" PRIu64 "\n"),
        dino = *dinop;
 
        /*
-        * enforce totblocks is 0 for misc types
+        * Enforce totblocks is 0 for misc types.
+        *
+        * Note that di_nblocks includes attribute fork blocks, so we can only
+        * do this here instead of when reading the inode.
         */
-       if (process_misc_ino_types_blocks(totblocks, lino, type))
-               goto clear_bad_out;
+       switch (type)  {
+       case XR_INO_CHRDEV:
+       case XR_INO_BLKDEV:
+       case XR_INO_SOCK:
+       case XR_INO_FIFO:
+               if (totblocks != 0)  {
+                       do_warn(
+_("size of %s inode %" PRIu64 " != 0 (%" PRIu64 " blocks)\n"),
+                               _(xr_ino_type_name[type]), lino, totblocks);
+                       goto clear_bad_out;
+               }
+               break;
+       default:
+               break;
+       }
 
        /*
         * correct space counters if required