__uint64_t      xs_write_bytes = 0;
        __uint64_t      xs_read_bytes = 0;
 
-       static struct xstats_entry {
+       static const struct xstats_entry {
                char    *desc;
                int     endpoint;
        } xstats[] = {
 
 /* Translate from CE_FOO to KERN_FOO, err_level(CE_FOO) == KERN_FOO */
 #define XFS_MAX_ERR_LEVEL      7
 #define XFS_ERR_MASK           ((1 << 3) - 1)
-static char            *err_level[XFS_MAX_ERR_LEVEL+1] =
+static const char * const      err_level[XFS_MAX_ERR_LEVEL+1] =
                                        {KERN_EMERG, KERN_ALERT, KERN_CRIT,
                                         KERN_ERR, KERN_WARNING, KERN_NOTICE,
                                         KERN_INFO, KERN_DEBUG};
 
 STATIC void    xfs_uuid_unmount(xfs_mount_t *mp);
 STATIC void    xfs_unmountfs_wait(xfs_mount_t *);
 
-static struct {
+static const struct {
     short offset;
     short type;     /* 0 = integer
                * 1 = binary / string (no translation)