xfs_io: pull xfs errortag definitions from libxfs

Use the libxfs definitions, don't provide our own.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/libxfs.h b/include/libxfs.h
index 6d08da4fbb6a7ad02e949d5192316642e41c2485..abb01cb697b2b7bce2b0e19be0e32ed263716576 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -61,6 +61,7 @@ extern uint32_t crc32c_le(uint32_t crc, unsigned char const *p, size_t len);
 #include "xfs_sb.h"
 #include "xfs_mount.h"
 #include "xfs_defer.h"
+#include "xfs_errortag.h"
 #include "xfs_da_format.h"
 #include "xfs_da_btree.h"
 #include "xfs_dir2.h"

diff --git a/io/inject.c b/io/inject.c
index 964ebfe13bd6ca05560773cd879f85fd34d8a2c5..9d0cf62ba127fccff8ed829ef6338586286bbcd5 100644 (file)
--- a/io/inject.c
+++ b/io/inject.c
@@ -20,6 +20,7 @@
 #include "input.h"
 #include "init.h"
 #include "io.h"
+#include "xfs_errortag.h"
 
 static cmdinfo_t inject_cmd;
 
@@ -29,70 +30,38 @@ error_tag(char *name)
        static struct {
                int     tag;
                char    *name;
-       } *e, eflags[] = {
-#define XFS_ERRTAG_NOERROR                              0
+       } *e, eflags[XFS_ERRTAG_MAX + 1] = {
                { XFS_ERRTAG_NOERROR,                   "noerror" },
-#define XFS_ERRTAG_IFLUSH_1                             1
                { XFS_ERRTAG_IFLUSH_1,                  "iflush1" },
-#define XFS_ERRTAG_IFLUSH_2                             2
                { XFS_ERRTAG_IFLUSH_2,                  "iflush2" },
-#define XFS_ERRTAG_IFLUSH_3                             3
                { XFS_ERRTAG_IFLUSH_3,                  "iflush3" },
-#define XFS_ERRTAG_IFLUSH_4                             4
                { XFS_ERRTAG_IFLUSH_4,                  "iflush4" },
-#define XFS_ERRTAG_IFLUSH_5                             5
                { XFS_ERRTAG_IFLUSH_5,                  "iflush5" },
-#define XFS_ERRTAG_IFLUSH_6                             6
                { XFS_ERRTAG_IFLUSH_6,                  "iflush6" },
-#define XFS_ERRTAG_DA_READ_BUF                          7
                { XFS_ERRTAG_DA_READ_BUF,               "dareadbuf" },
-#define XFS_ERRTAG_BTREE_CHECK_LBLOCK                   8
                { XFS_ERRTAG_BTREE_CHECK_LBLOCK,        "btree_chk_lblk" },
-#define XFS_ERRTAG_BTREE_CHECK_SBLOCK                   9
                { XFS_ERRTAG_BTREE_CHECK_SBLOCK,        "btree_chk_sblk" },
-#define XFS_ERRTAG_ALLOC_READ_AGF                       10
                { XFS_ERRTAG_ALLOC_READ_AGF,            "readagf" },
-#define XFS_ERRTAG_IALLOC_READ_AGI                      11
                { XFS_ERRTAG_IALLOC_READ_AGI,           "readagi" },
-#define XFS_ERRTAG_ITOBP_INOTOBP                        12
                { XFS_ERRTAG_ITOBP_INOTOBP,             "itobp" },
-#define XFS_ERRTAG_IUNLINK                              13
                { XFS_ERRTAG_IUNLINK,                   "iunlink" },
-#define XFS_ERRTAG_IUNLINK_REMOVE                       14
                { XFS_ERRTAG_IUNLINK_REMOVE,            "iunlinkrm" },
-#define XFS_ERRTAG_DIR_INO_VALIDATE                     15
                { XFS_ERRTAG_DIR_INO_VALIDATE,          "dirinovalid" },
-#define XFS_ERRTAG_BULKSTAT_READ_CHUNK                  16
                { XFS_ERRTAG_BULKSTAT_READ_CHUNK,       "bulkstat" },
-#define XFS_ERRTAG_IODONE_IOERR                         17
                { XFS_ERRTAG_IODONE_IOERR,              "logiodone" },
-#define XFS_ERRTAG_STRATREAD_IOERR                      18
                { XFS_ERRTAG_STRATREAD_IOERR,           "stratread" },
-#define XFS_ERRTAG_STRATCMPL_IOERR                      19
                { XFS_ERRTAG_STRATCMPL_IOERR,           "stratcmpl" },
-#define XFS_ERRTAG_DIOWRITE_IOERR                       20
                { XFS_ERRTAG_DIOWRITE_IOERR,            "diowrite" },
-#define XFS_ERRTAG_BMAPIFORMAT                          21
                { XFS_ERRTAG_BMAPIFORMAT,               "bmapifmt" },
-#define XFS_ERRTAG_FREE_EXTENT                         22
                { XFS_ERRTAG_FREE_EXTENT,               "free_extent" },
-#define XFS_ERRTAG_RMAP_FINISH_ONE                     23
                { XFS_ERRTAG_RMAP_FINISH_ONE,           "rmap_finish_one" },
-#define XFS_ERRTAG_REFCOUNT_CONTINUE_UPDATE            24
                { XFS_ERRTAG_REFCOUNT_CONTINUE_UPDATE,  "refcount_continue_update" },
-#define XFS_ERRTAG_REFCOUNT_FINISH_ONE                 25
                { XFS_ERRTAG_REFCOUNT_FINISH_ONE,       "refcount_finish_one" },
-#define XFS_ERRTAG_BMAP_FINISH_ONE                     26
                { XFS_ERRTAG_BMAP_FINISH_ONE,           "bmap_finish_one" },
-#define XFS_ERRTAG_AG_RESV_CRITICAL                    27
                { XFS_ERRTAG_AG_RESV_CRITICAL,          "ag_resv_critical" },
-#define XFS_ERRTAG_DROP_WRITES                         28
                { XFS_ERRTAG_DROP_WRITES,               "drop_writes" },
-#define XFS_ERRTAG_LOG_BAD_CRC                         29
                { XFS_ERRTAG_LOG_BAD_CRC,               "log_bad_crc" },
-#define XFS_ERRTAG_LOG_ITEM_PIN                                30
                { XFS_ERRTAG_LOG_ITEM_PIN,              "log_item_pin" },
-#define XFS_ERRTAG_MAX                                  31
                { XFS_ERRTAG_MAX,                       NULL }
        };
        int     count;