volume_id: improve struct layout (smaller offesets, smaller insns on x86)

function                                             old     new   delta
volume_id_probe_xfs                                  101      98      -3
volume_id_probe_vfat                                 827     824      -3
volume_id_probe_udf                                  541     538      -3
volume_id_probe_ubifs                                 67      64      -3
volume_id_probe_squashfs                              86      83      -3
volume_id_probe_romfs                                 97      94      -3
volume_id_probe_reiserfs                             246     243      -3
volume_id_probe_ocfs2                                110     107      -3
volume_id_probe_ntfs                                 288     285      -3
volume_id_probe_nilfs                                100      97      -3
volume_id_probe_minix                                 85      82      -3
volume_id_probe_luks                                  92      89      -3
volume_id_probe_linux_swap                           251     248      -3
volume_id_probe_linux_raid                           131     128      -3
volume_id_probe_lfs                                   62      59      -3
volume_id_probe_jfs                                  110     107      -3
volume_id_probe_iso9660                              318     315      -3
volume_id_probe_f2fs                                 107     104      -3
volume_id_probe_exfat                                285     282      -3
volume_id_probe_erofs                                 89      86      -3
volume_id_probe_cramfs                                67      64      -3
volume_id_probe_btrfs                                134     131      -3
volume_id_probe_bcache                               107     104      -3
volume_id_probe_sysv                                 194     188      -6
volume_id_probe_hfs_hfsplus                          518     512      -6
add_to_uuid_cache                                    271     265      -6
volume_id_probe_ext                                  131     122      -9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/27 up/down: 0/-96)            Total: -96 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h
index 609beb84e..b1e44481f 100644
--- a/util-linux/volume_id/volume_id_internal.h
+++ b/util-linux/volume_id/volume_id_internal.h
@@ -66,6 +66,9 @@ struct volume_id {
         uint8_t         *sbbuf;
         uint8_t         *seekbuf;
         uint64_t        seekbuf_off;
+#if ENABLE_FEATURE_BLKID_TYPE
+        const char      *type;
+#endif
 #ifdef UNUSED_PARTITION_CODE
         struct volume_id_partition *partitions;
         size_t          partition_count;
@@ -80,9 +83,6 @@ struct volume_id {
 //      char            type_version[VOLUME_ID_FORMAT_SIZE];
 //      smallint        usage_id;
 //      const char      *usage;
-#if ENABLE_FEATURE_BLKID_TYPE
-        const char      *type;
-#endif
 };
 
 struct volume_id* FAST_FUNC volume_id_open_node(int fd);