aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-11-01 23:07:18 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2009-11-01 23:07:18 +0100
commit893009644fb0e4854193e664f512b96fa5590041 (patch)
tree14b264eb48ea449b588c82cd9cf404f5e0769902
parent662e8b79d011d022c40c717501b727c1480a105f (diff)
downloadbusybox-w32-893009644fb0e4854193e664f512b96fa5590041.tar.gz
busybox-w32-893009644fb0e4854193e664f512b96fa5590041.tar.bz2
busybox-w32-893009644fb0e4854193e664f512b96fa5590041.zip
volume_id: add FAST_FUNC where appropriate
function old new delta volume_id_probe_iso9660 324 327 +3 volume_id_probe_vfat 902 903 +1 volume_id_probe_udf 576 577 +1 volume_id_probe_ntfs 314 315 +1 uuidcache_check_device 292 291 -1 volume_id_probe_xfs 87 85 -2 volume_id_probe_sysv 165 163 -2 volume_id_probe_romfs 89 87 -2 volume_id_probe_reiserfs 236 234 -2 volume_id_probe_ocfs2 96 94 -2 volume_id_probe_luks 78 76 -2 volume_id_probe_linux_swap 165 163 -2 volume_id_probe_jfs 96 94 -2 volume_id_probe_hfs_hfsplus 795 793 -2 volume_id_probe_ext 82 80 -2 volume_id_probe_cramfs 59 57 -2 volume_id_probe_btrfs 96 94 -2 free_volume_id 36 31 -5 volume_id_probe_linux_raid 127 119 -8 volume_id_probe_all 152 138 -14 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/16 up/down: 6/-52) Total: -46 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat
-rw-r--r--util-linux/volume_id/btrfs.c2
-rw-r--r--util-linux/volume_id/cramfs.c2
-rw-r--r--util-linux/volume_id/ext.c2
-rw-r--r--util-linux/volume_id/fat.c2
-rw-r--r--util-linux/volume_id/hfs.c2
-rw-r--r--util-linux/volume_id/iso9660.c2
-rw-r--r--util-linux/volume_id/jfs.c2
-rw-r--r--util-linux/volume_id/linux_raid.c2
-rw-r--r--util-linux/volume_id/linux_swap.c2
-rw-r--r--util-linux/volume_id/luks.c2
-rw-r--r--util-linux/volume_id/ntfs.c2
-rw-r--r--util-linux/volume_id/ocfs2.c2
-rw-r--r--util-linux/volume_id/reiserfs.c2
-rw-r--r--util-linux/volume_id/romfs.c2
-rw-r--r--util-linux/volume_id/sysv.c2
-rw-r--r--util-linux/volume_id/udf.c2
-rw-r--r--util-linux/volume_id/unused_highpoint.c4
-rw-r--r--util-linux/volume_id/unused_hpfs.c2
-rw-r--r--util-linux/volume_id/unused_isw_raid.c2
-rw-r--r--util-linux/volume_id/unused_lsi_raid.c2
-rw-r--r--util-linux/volume_id/unused_lvm.c4
-rw-r--r--util-linux/volume_id/unused_mac.c2
-rw-r--r--util-linux/volume_id/unused_minix.c2
-rw-r--r--util-linux/volume_id/unused_msdos.c2
-rw-r--r--util-linux/volume_id/unused_nvidia_raid.c2
-rw-r--r--util-linux/volume_id/unused_promise_raid.c2
-rw-r--r--util-linux/volume_id/unused_silicon_raid.c2
-rw-r--r--util-linux/volume_id/unused_ufs.c2
-rw-r--r--util-linux/volume_id/unused_via_raid.c2
-rw-r--r--util-linux/volume_id/volume_id.c12
-rw-r--r--util-linux/volume_id/volume_id_internal.h70
-rw-r--r--util-linux/volume_id/xfs.c2
32 files changed, 73 insertions, 73 deletions
diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c
index 98f150793..53bac7438 100644
--- a/util-linux/volume_id/btrfs.c
+++ b/util-linux/volume_id/btrfs.c
@@ -78,7 +78,7 @@ struct btrfs_super_block {
78 // ... 78 // ...
79} PACKED; 79} PACKED;
80 80
81int volume_id_probe_btrfs(struct volume_id *id /*,uint64_t off*/) 81int FAST_FUNC volume_id_probe_btrfs(struct volume_id *id /*,uint64_t off*/)
82{ 82{
83#define off ((uint64_t) (64 * 1024)) 83#define off ((uint64_t) (64 * 1024))
84 struct btrfs_super_block *sb; 84 struct btrfs_super_block *sb;
diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c
index 37b991105..b84a6f0b2 100644
--- a/util-linux/volume_id/cramfs.c
+++ b/util-linux/volume_id/cramfs.c
@@ -35,7 +35,7 @@ struct cramfs_super {
35 uint8_t name[16]; 35 uint8_t name[16];
36} PACKED; 36} PACKED;
37 37
38int volume_id_probe_cramfs(struct volume_id *id /*,uint64_t off*/) 38int FAST_FUNC volume_id_probe_cramfs(struct volume_id *id /*,uint64_t off*/)
39{ 39{
40#define off ((uint64_t)0) 40#define off ((uint64_t)0)
41 struct cramfs_super *cs; 41 struct cramfs_super *cs;
diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index e4097737b..80c217f98 100644
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -43,7 +43,7 @@ struct ext2_super_block {
43#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x00000008 43#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x00000008
44#define EXT_SUPERBLOCK_OFFSET 0x400 44#define EXT_SUPERBLOCK_OFFSET 0x400
45 45
46int volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/) 46int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
47{ 47{
48#define off ((uint64_t)0) 48#define off ((uint64_t)0)
49 struct ext2_super_block *es; 49 struct ext2_super_block *es;
diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c
index 8cf429ec5..6173ba9f0 100644
--- a/util-linux/volume_id/fat.c
+++ b/util-linux/volume_id/fat.c
@@ -119,7 +119,7 @@ static uint8_t *get_attr_volume_id(struct vfat_dir_entry *dir, int count)
119 return NULL; 119 return NULL;
120} 120}
121 121
122int volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partition_off*/) 122int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partition_off*/)
123{ 123{
124#define fat_partition_off ((uint64_t)0) 124#define fat_partition_off ((uint64_t)0)
125 struct vfat_super_block *vs; 125 struct vfat_super_block *vs;
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index 71a5e8b09..cf7585138 100644
--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@@ -131,7 +131,7 @@ struct hfsplus_vol_header {
131#define HFS_NODE_LEAF 0xff 131#define HFS_NODE_LEAF 0xff
132#define HFSPLUS_POR_CNID 1 132#define HFSPLUS_POR_CNID 1
133 133
134int volume_id_probe_hfs_hfsplus(struct volume_id *id /*,uint64_t off*/) 134int FAST_FUNC volume_id_probe_hfs_hfsplus(struct volume_id *id /*,uint64_t off*/)
135{ 135{
136 uint64_t off = 0; 136 uint64_t off = 0;
137 unsigned blocksize; 137 unsigned blocksize;
diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c
index 76fa546bf..1519de496 100644
--- a/util-linux/volume_id/iso9660.c
+++ b/util-linux/volume_id/iso9660.c
@@ -47,7 +47,7 @@ struct high_sierra_volume_descriptor {
47 uint8_t version; 47 uint8_t version;
48} PACKED; 48} PACKED;
49 49
50int volume_id_probe_iso9660(struct volume_id *id /*,uint64_t off*/) 50int FAST_FUNC volume_id_probe_iso9660(struct volume_id *id /*,uint64_t off*/)
51{ 51{
52#define off ((uint64_t)0) 52#define off ((uint64_t)0)
53 uint8_t *buf; 53 uint8_t *buf;
diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c
index eb6008fc4..eb7a44872 100644
--- a/util-linux/volume_id/jfs.c
+++ b/util-linux/volume_id/jfs.c
@@ -35,7 +35,7 @@ struct jfs_super_block {
35 35
36#define JFS_SUPERBLOCK_OFFSET 0x8000 36#define JFS_SUPERBLOCK_OFFSET 0x8000
37 37
38int volume_id_probe_jfs(struct volume_id *id /*,uint64_t off*/) 38int FAST_FUNC volume_id_probe_jfs(struct volume_id *id /*,uint64_t off*/)
39{ 39{
40#define off ((uint64_t)0) 40#define off ((uint64_t)0)
41 struct jfs_super_block *js; 41 struct jfs_super_block *js;
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index b691f2037..d1bf0c308 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -42,7 +42,7 @@ struct mdp_super_block {
42#define MD_RESERVED_BYTES 0x10000 42#define MD_RESERVED_BYTES 0x10000
43#define MD_MAGIC 0xa92b4efc 43#define MD_MAGIC 0xa92b4efc
44 44
45int volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size) 45int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size)
46{ 46{
47#define off ((uint64_t)0) 47#define off ((uint64_t)0)
48 uint64_t sboff; 48 uint64_t sboff;
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index 7ae451649..1b5488f9e 100644
--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@@ -31,7 +31,7 @@ struct swap_header_v1_2 {
31 31
32#define LARGEST_PAGESIZE 0x4000 32#define LARGEST_PAGESIZE 0x4000
33 33
34int volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/) 34int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/)
35{ 35{
36#define off ((uint64_t)0) 36#define off ((uint64_t)0)
37 struct swap_header_v1_2 *sw; 37 struct swap_header_v1_2 *sw;
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index ebc7d160d..8ab09e381 100644
--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@@ -80,7 +80,7 @@ struct BUG_bad_size_luks_phdr {
80 1 : -1]; 80 1 : -1];
81}; 81};
82 82
83int volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/) 83int FAST_FUNC volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/)
84{ 84{
85#define off ((uint64_t)0) 85#define off ((uint64_t)0)
86 struct luks_phdr *header; 86 struct luks_phdr *header;
diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c
index 3b3e97347..17b1fe8b3 100644
--- a/util-linux/volume_id/ntfs.c
+++ b/util-linux/volume_id/ntfs.c
@@ -84,7 +84,7 @@ struct volume_info {
84#define MFT_RECORD_ATTR_OBJECT_ID 0x40 84#define MFT_RECORD_ATTR_OBJECT_ID 0x40
85#define MFT_RECORD_ATTR_END 0xffffffffu 85#define MFT_RECORD_ATTR_END 0xffffffffu
86 86
87int volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/) 87int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/)
88{ 88{
89#define off ((uint64_t)0) 89#define off ((uint64_t)0)
90 unsigned sector_size; 90 unsigned sector_size;
diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c
index 14573caa1..e6c455965 100644
--- a/util-linux/volume_id/ocfs2.c
+++ b/util-linux/volume_id/ocfs2.c
@@ -80,7 +80,7 @@ struct ocfs2_super_block {
80 uint8_t s_uuid[OCFS2_VOL_UUID_LEN]; /* 128-bit uuid */ 80 uint8_t s_uuid[OCFS2_VOL_UUID_LEN]; /* 128-bit uuid */
81} PACKED; 81} PACKED;
82 82
83int volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/) 83int FAST_FUNC volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/)
84{ 84{
85#define off ((uint64_t)0) 85#define off ((uint64_t)0)
86 struct ocfs2_super_block *os; 86 struct ocfs2_super_block *os;
diff --git a/util-linux/volume_id/reiserfs.c b/util-linux/volume_id/reiserfs.c
index 1298f86ae..3120b29a0 100644
--- a/util-linux/volume_id/reiserfs.c
+++ b/util-linux/volume_id/reiserfs.c
@@ -48,7 +48,7 @@ struct reiser4_super_block {
48#define REISERFS1_SUPERBLOCK_OFFSET 0x2000 48#define REISERFS1_SUPERBLOCK_OFFSET 0x2000
49#define REISERFS_SUPERBLOCK_OFFSET 0x10000 49#define REISERFS_SUPERBLOCK_OFFSET 0x10000
50 50
51int volume_id_probe_reiserfs(struct volume_id *id /*,uint64_t off*/) 51int FAST_FUNC volume_id_probe_reiserfs(struct volume_id *id /*,uint64_t off*/)
52{ 52{
53#define off ((uint64_t)0) 53#define off ((uint64_t)0)
54 struct reiserfs_super_block *rs; 54 struct reiserfs_super_block *rs;
diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c
index f5005cd50..228e77a41 100644
--- a/util-linux/volume_id/romfs.c
+++ b/util-linux/volume_id/romfs.c
@@ -27,7 +27,7 @@ struct romfs_super {
27 uint8_t name[]; 27 uint8_t name[];
28} PACKED; 28} PACKED;
29 29
30int volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/) 30int FAST_FUNC volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/)
31{ 31{
32#define off ((uint64_t)0) 32#define off ((uint64_t)0)
33 struct romfs_super *rfs; 33 struct romfs_super *rfs;
diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c
index 0e6507291..e0fa20a8c 100644
--- a/util-linux/volume_id/sysv.c
+++ b/util-linux/volume_id/sysv.c
@@ -82,7 +82,7 @@ struct xenix_super {
82#define XENIX_MAGIC 0x2b5544 82#define XENIX_MAGIC 0x2b5544
83#define SYSV_MAX_BLOCKSIZE 0x800 83#define SYSV_MAX_BLOCKSIZE 0x800
84 84
85int volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/) 85int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/)
86{ 86{
87#define off ((uint64_t)0) 87#define off ((uint64_t)0)
88 struct sysv_super *vs; 88 struct sysv_super *vs;
diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c
index a6e719a3c..dd2573171 100644
--- a/util-linux/volume_id/udf.c
+++ b/util-linux/volume_id/udf.c
@@ -55,7 +55,7 @@ struct volume_structure_descriptor {
55 55
56#define UDF_VSD_OFFSET 0x8000 56#define UDF_VSD_OFFSET 0x8000
57 57
58int volume_id_probe_udf(struct volume_id *id /*,uint64_t off*/) 58int FAST_FUNC volume_id_probe_udf(struct volume_id *id /*,uint64_t off*/)
59{ 59{
60#define off ((uint64_t)0) 60#define off ((uint64_t)0)
61 struct volume_descriptor *vd; 61 struct volume_descriptor *vd;
diff --git a/util-linux/volume_id/unused_highpoint.c b/util-linux/volume_id/unused_highpoint.c
index 6fd58b787..17b7b3291 100644
--- a/util-linux/volume_id/unused_highpoint.c
+++ b/util-linux/volume_id/unused_highpoint.c
@@ -37,7 +37,7 @@ struct hpt45x_meta {
37#define HPT45X_MAGIC_BAD 0x5a7816fd 37#define HPT45X_MAGIC_BAD 0x5a7816fd
38 38
39 39
40int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off) 40int FAST_FUNC volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off)
41{ 41{
42 struct hpt37x_meta *hpt; 42 struct hpt37x_meta *hpt;
43 uint32_t magic; 43 uint32_t magic;
@@ -58,7 +58,7 @@ int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off)
58 return 0; 58 return 0;
59} 59}
60 60
61int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size) 61int FAST_FUNC volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size)
62{ 62{
63 struct hpt45x_meta *hpt; 63 struct hpt45x_meta *hpt;
64 uint64_t meta_off; 64 uint64_t meta_off;
diff --git a/util-linux/volume_id/unused_hpfs.c b/util-linux/volume_id/unused_hpfs.c
index 8c7897a77..442952464 100644
--- a/util-linux/volume_id/unused_hpfs.c
+++ b/util-linux/volume_id/unused_hpfs.c
@@ -27,7 +27,7 @@ struct hpfs_super {
27 27
28#define HPFS_SUPERBLOCK_OFFSET 0x2000 28#define HPFS_SUPERBLOCK_OFFSET 0x2000
29 29
30int volume_id_probe_hpfs(struct volume_id *id, uint64_t off) 30int FAST_FUNC volume_id_probe_hpfs(struct volume_id *id, uint64_t off)
31{ 31{
32 struct hpfs_super *hs; 32 struct hpfs_super *hs;
33 33
diff --git a/util-linux/volume_id/unused_isw_raid.c b/util-linux/volume_id/unused_isw_raid.c
index b31a124a2..7ab47b3a1 100644
--- a/util-linux/volume_id/unused_isw_raid.c
+++ b/util-linux/volume_id/unused_isw_raid.c
@@ -31,7 +31,7 @@ struct isw_meta {
31#define ISW_SIGNATURE "Intel Raid ISM Cfg Sig. " 31#define ISW_SIGNATURE "Intel Raid ISM Cfg Sig. "
32 32
33 33
34int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size) 34int FAST_FUNC volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size)
35{ 35{
36 uint64_t meta_off; 36 uint64_t meta_off;
37 struct isw_meta *isw; 37 struct isw_meta *isw;
diff --git a/util-linux/volume_id/unused_lsi_raid.c b/util-linux/volume_id/unused_lsi_raid.c
index 6899900db..e6cc8edd3 100644
--- a/util-linux/volume_id/unused_lsi_raid.c
+++ b/util-linux/volume_id/unused_lsi_raid.c
@@ -26,7 +26,7 @@ struct lsi_meta {
26 26
27#define LSI_SIGNATURE "$XIDE$" 27#define LSI_SIGNATURE "$XIDE$"
28 28
29int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size) 29int FAST_FUNC volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size)
30{ 30{
31 uint64_t meta_off; 31 uint64_t meta_off;
32 struct lsi_meta *lsi; 32 struct lsi_meta *lsi;
diff --git a/util-linux/volume_id/unused_lvm.c b/util-linux/volume_id/unused_lvm.c
index c3270681e..2206498bf 100644
--- a/util-linux/volume_id/unused_lvm.c
+++ b/util-linux/volume_id/unused_lvm.c
@@ -34,7 +34,7 @@ struct lvm2_super_block {
34 34
35#define LVM1_SB_OFF 0x400 35#define LVM1_SB_OFF 0x400
36 36
37int volume_id_probe_lvm1(struct volume_id *id, uint64_t off) 37int FAST_FUNC volume_id_probe_lvm1(struct volume_id *id, uint64_t off)
38{ 38{
39 struct lvm1_super_block *lvm; 39 struct lvm1_super_block *lvm;
40 40
@@ -56,7 +56,7 @@ int volume_id_probe_lvm1(struct volume_id *id, uint64_t off)
56#define LVM2_LABEL_ID "LABELONE" 56#define LVM2_LABEL_ID "LABELONE"
57#define LVM2LABEL_SCAN_SECTORS 4 57#define LVM2LABEL_SCAN_SECTORS 4
58 58
59int volume_id_probe_lvm2(struct volume_id *id, uint64_t off) 59int FAST_FUNC volume_id_probe_lvm2(struct volume_id *id, uint64_t off)
60{ 60{
61 const uint8_t *buf; 61 const uint8_t *buf;
62 unsigned soff; 62 unsigned soff;
diff --git a/util-linux/volume_id/unused_mac.c b/util-linux/volume_id/unused_mac.c
index c4732ee0d..e8deb9720 100644
--- a/util-linux/volume_id/unused_mac.c
+++ b/util-linux/volume_id/unused_mac.c
@@ -36,7 +36,7 @@ struct mac_partition {
36 uint8_t type[32]; 36 uint8_t type[32];
37} PACKED; 37} PACKED;
38 38
39int volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off) 39int FAST_FUNC volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off)
40{ 40{
41 const uint8_t *buf; 41 const uint8_t *buf;
42 struct mac_driver_desc *driver; 42 struct mac_driver_desc *driver;
diff --git a/util-linux/volume_id/unused_minix.c b/util-linux/volume_id/unused_minix.c
index 4f4f8a720..a3e1077b0 100644
--- a/util-linux/volume_id/unused_minix.c
+++ b/util-linux/volume_id/unused_minix.c
@@ -35,7 +35,7 @@ struct minix_super_block {
35 35
36#define MINIX_SUPERBLOCK_OFFSET 0x400 36#define MINIX_SUPERBLOCK_OFFSET 0x400
37 37
38int volume_id_probe_minix(struct volume_id *id, uint64_t off) 38int FAST_FUNC volume_id_probe_minix(struct volume_id *id, uint64_t off)
39{ 39{
40 struct minix_super_block *ms; 40 struct minix_super_block *ms;
41 41
diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c
index 465f22dc3..ccec72c5e 100644
--- a/util-linux/volume_id/unused_msdos.c
+++ b/util-linux/volume_id/unused_msdos.c
@@ -47,7 +47,7 @@ struct msdos_partition_entry {
47#define is_raid(type) \ 47#define is_raid(type) \
48 (type == LINUX_RAID_PARTITION) 48 (type == LINUX_RAID_PARTITION)
49 49
50int volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t off) 50int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t off)
51{ 51{
52 const uint8_t *buf; 52 const uint8_t *buf;
53 int i; 53 int i;
diff --git a/util-linux/volume_id/unused_nvidia_raid.c b/util-linux/volume_id/unused_nvidia_raid.c
index b65cec41d..9e8472921 100644
--- a/util-linux/volume_id/unused_nvidia_raid.c
+++ b/util-linux/volume_id/unused_nvidia_raid.c
@@ -29,7 +29,7 @@ struct nvidia_meta {
29 29
30#define NVIDIA_SIGNATURE "NVIDIA" 30#define NVIDIA_SIGNATURE "NVIDIA"
31 31
32int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size) 32int FAST_FUNC volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size)
33{ 33{
34 uint64_t meta_off; 34 uint64_t meta_off;
35 struct nvidia_meta *nv; 35 struct nvidia_meta *nv;
diff --git a/util-linux/volume_id/unused_promise_raid.c b/util-linux/volume_id/unused_promise_raid.c
index 4a15ddaf1..0b0d0063c 100644
--- a/util-linux/volume_id/unused_promise_raid.c
+++ b/util-linux/volume_id/unused_promise_raid.c
@@ -27,7 +27,7 @@ struct promise_meta {
27#define PDC_CONFIG_OFF 0x1200 27#define PDC_CONFIG_OFF 0x1200
28#define PDC_SIGNATURE "Promise Technology, Inc." 28#define PDC_SIGNATURE "Promise Technology, Inc."
29 29
30int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size) 30int FAST_FUNC volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size)
31{ 31{
32 static const unsigned short sectors[] = { 32 static const unsigned short sectors[] = {
33 63, 255, 256, 16, 399 33 63, 255, 256, 16, 399
diff --git a/util-linux/volume_id/unused_silicon_raid.c b/util-linux/volume_id/unused_silicon_raid.c
index 6ce4037c6..d1c439ecf 100644
--- a/util-linux/volume_id/unused_silicon_raid.c
+++ b/util-linux/volume_id/unused_silicon_raid.c
@@ -41,7 +41,7 @@ struct silicon_meta {
41 41
42#define SILICON_MAGIC 0x2F000000 42#define SILICON_MAGIC 0x2F000000
43 43
44int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint64_t size) 44int FAST_FUNC volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint64_t size)
45{ 45{
46 uint64_t meta_off; 46 uint64_t meta_off;
47 struct silicon_meta *sil; 47 struct silicon_meta *sil;
diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c
index e05e93380..9f925d983 100644
--- a/util-linux/volume_id/unused_ufs.c
+++ b/util-linux/volume_id/unused_ufs.c
@@ -162,7 +162,7 @@ struct ufs_super_block {
162#define UFS_MAGIC_FEA 0x00195612 162#define UFS_MAGIC_FEA 0x00195612
163#define UFS_MAGIC_LFN 0x00095014 163#define UFS_MAGIC_LFN 0x00095014
164 164
165int volume_id_probe_ufs(struct volume_id *id, uint64_t off) 165int FAST_FUNC volume_id_probe_ufs(struct volume_id *id, uint64_t off)
166{ 166{
167 static const short offsets[] = { 0, 8, 64, 256 }; 167 static const short offsets[] = { 0, 8, 64, 256 };
168 168
diff --git a/util-linux/volume_id/unused_via_raid.c b/util-linux/volume_id/unused_via_raid.c
index 21ed315ba..a11eec13a 100644
--- a/util-linux/volume_id/unused_via_raid.c
+++ b/util-linux/volume_id/unused_via_raid.c
@@ -36,7 +36,7 @@ struct via_meta {
36 36
37#define VIA_SIGNATURE 0xAA55 37#define VIA_SIGNATURE 0xAA55
38 38
39int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size) 39int FAST_FUNC volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size)
40{ 40{
41 uint64_t meta_off; 41 uint64_t meta_off;
42 struct via_meta *via; 42 struct via_meta *via;
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c
index 590f51da9..4826c2e65 100644
--- a/util-linux/volume_id/volume_id.c
+++ b/util-linux/volume_id/volume_id.c
@@ -45,8 +45,8 @@
45#define ENABLE_FEATURE_VOLUMEID_UFS 0 45#define ENABLE_FEATURE_VOLUMEID_UFS 0
46 46
47 47
48typedef int (*raid_probe_fptr)(struct volume_id *id, /*uint64_t off,*/ uint64_t size); 48typedef int FAST_FUNC (*raid_probe_fptr)(struct volume_id *id, /*uint64_t off,*/ uint64_t size);
49typedef int (*probe_fptr)(struct volume_id *id /*, uint64_t off*/); 49typedef int FAST_FUNC (*probe_fptr)(struct volume_id *id /*, uint64_t off*/);
50 50
51static const raid_probe_fptr raid1[] = { 51static const raid_probe_fptr raid1[] = {
52#if ENABLE_FEATURE_VOLUMEID_LINUXRAID 52#if ENABLE_FEATURE_VOLUMEID_LINUXRAID
@@ -153,7 +153,7 @@ static const probe_fptr fs2[] = {
153#endif 153#endif
154}; 154};
155 155
156int volume_id_probe_all(struct volume_id *id, /*uint64_t off,*/ uint64_t size) 156int FAST_FUNC volume_id_probe_all(struct volume_id *id, /*uint64_t off,*/ uint64_t size)
157{ 157{
158 unsigned i; 158 unsigned i;
159 159
@@ -199,7 +199,7 @@ int volume_id_probe_all(struct volume_id *id, /*uint64_t off,*/ uint64_t size)
199} 199}
200 200
201/* open volume by device node */ 201/* open volume by device node */
202struct volume_id *volume_id_open_node(int fd) 202struct volume_id* FAST_FUNC volume_id_open_node(int fd)
203{ 203{
204 struct volume_id *id; 204 struct volume_id *id;
205 205
@@ -212,7 +212,7 @@ struct volume_id *volume_id_open_node(int fd)
212 212
213#ifdef UNUSED 213#ifdef UNUSED
214/* open volume by major/minor */ 214/* open volume by major/minor */
215struct volume_id *volume_id_open_dev_t(dev_t devt) 215struct volume_id* FAST_FUNC volume_id_open_dev_t(dev_t devt)
216{ 216{
217 struct volume_id *id; 217 struct volume_id *id;
218 char *tmp_node[VOLUME_ID_PATH_MAX]; 218 char *tmp_node[VOLUME_ID_PATH_MAX];
@@ -232,7 +232,7 @@ struct volume_id *volume_id_open_dev_t(dev_t devt)
232} 232}
233#endif 233#endif
234 234
235void free_volume_id(struct volume_id *id) 235void FAST_FUNC free_volume_id(struct volume_id *id)
236{ 236{
237 if (id == NULL) 237 if (id == NULL)
238 return; 238 return;
diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h
index 65575b7a9..9b808ff6b 100644
--- a/util-linux/volume_id/volume_id_internal.h
+++ b/util-linux/volume_id/volume_id_internal.h
@@ -83,9 +83,9 @@ struct volume_id {
83// const char *type; 83// const char *type;
84}; 84};
85 85
86struct volume_id *volume_id_open_node(int fd); 86struct volume_id* FAST_FUNC volume_id_open_node(int fd);
87int volume_id_probe_all(struct volume_id *id, /*uint64_t off,*/ uint64_t size); 87int FAST_FUNC volume_id_probe_all(struct volume_id *id, /*uint64_t off,*/ uint64_t size);
88void free_volume_id(struct volume_id *id); 88void FAST_FUNC free_volume_id(struct volume_id *id);
89 89
90/* util.h */ 90/* util.h */
91 91
@@ -162,68 +162,68 @@ void volume_id_free_buffer(struct volume_id *id);
162 162
163/* RAID */ 163/* RAID */
164 164
165//int volume_id_probe_highpoint_37x_raid(struct volume_id *id /*,uint64_t off*/); 165//int FAST_FUNC volume_id_probe_highpoint_37x_raid(struct volume_id *id /*,uint64_t off*/);
166//int volume_id_probe_highpoint_45x_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); 166//int FAST_FUNC volume_id_probe_highpoint_45x_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
167 167
168//int volume_id_probe_intel_software_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); 168//int FAST_FUNC volume_id_probe_intel_software_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
169 169
170int volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); 170int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
171 171
172//int volume_id_probe_lsi_mega_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); 172//int FAST_FUNC volume_id_probe_lsi_mega_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
173 173
174//int volume_id_probe_nvidia_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); 174//int FAST_FUNC volume_id_probe_nvidia_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
175 175
176//int volume_id_probe_promise_fasttrack_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); 176//int FAST_FUNC volume_id_probe_promise_fasttrack_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
177 177
178//int volume_id_probe_silicon_medley_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); 178//int FAST_FUNC volume_id_probe_silicon_medley_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
179 179
180//int volume_id_probe_via_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); 180//int FAST_FUNC volume_id_probe_via_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
181 181
182//int volume_id_probe_lvm1(struct volume_id *id /*,uint64_t off*/); 182//int FAST_FUNC volume_id_probe_lvm1(struct volume_id *id /*,uint64_t off*/);
183//int volume_id_probe_lvm2(struct volume_id *id /*,uint64_t off*/); 183//int FAST_FUNC volume_id_probe_lvm2(struct volume_id *id /*,uint64_t off*/);
184 184
185/* FS */ 185/* FS */
186 186
187int volume_id_probe_btrfs(struct volume_id *id /*,uint64_t off*/); 187int FAST_FUNC volume_id_probe_btrfs(struct volume_id *id /*,uint64_t off*/);
188 188
189int volume_id_probe_cramfs(struct volume_id *id /*,uint64_t off*/); 189int FAST_FUNC volume_id_probe_cramfs(struct volume_id *id /*,uint64_t off*/);
190 190
191int volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/); 191int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/);
192 192
193int volume_id_probe_vfat(struct volume_id *id /*,uint64_t off*/); 193int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t off*/);
194 194
195int volume_id_probe_hfs_hfsplus(struct volume_id *id /*,uint64_t off*/); 195int FAST_FUNC volume_id_probe_hfs_hfsplus(struct volume_id *id /*,uint64_t off*/);
196 196
197//int volume_id_probe_hpfs(struct volume_id *id /*,uint64_t off*/); 197//int FAST_FUNC volume_id_probe_hpfs(struct volume_id *id /*,uint64_t off*/);
198 198
199int volume_id_probe_iso9660(struct volume_id *id /*,uint64_t off*/); 199int FAST_FUNC volume_id_probe_iso9660(struct volume_id *id /*,uint64_t off*/);
200 200
201int volume_id_probe_jfs(struct volume_id *id /*,uint64_t off*/); 201int FAST_FUNC volume_id_probe_jfs(struct volume_id *id /*,uint64_t off*/);
202 202
203int volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/); 203int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/);
204 204
205int volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/); 205int FAST_FUNC volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/);
206 206
207//int volume_id_probe_mac_partition_map(struct volume_id *id /*,uint64_t off*/); 207//int FAST_FUNC volume_id_probe_mac_partition_map(struct volume_id *id /*,uint64_t off*/);
208 208
209//int volume_id_probe_minix(struct volume_id *id /*,uint64_t off*/); 209//int FAST_FUNC volume_id_probe_minix(struct volume_id *id /*,uint64_t off*/);
210 210
211//int volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/); 211//int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/);
212 212
213int volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/); 213int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/);
214 214
215int volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/); 215int FAST_FUNC volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/);
216 216
217int volume_id_probe_reiserfs(struct volume_id *id /*,uint64_t off*/); 217int FAST_FUNC volume_id_probe_reiserfs(struct volume_id *id /*,uint64_t off*/);
218 218
219int volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/); 219int FAST_FUNC volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/);
220 220
221int volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/); 221int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/);
222 222
223int volume_id_probe_udf(struct volume_id *id /*,uint64_t off*/); 223int FAST_FUNC volume_id_probe_udf(struct volume_id *id /*,uint64_t off*/);
224 224
225//int volume_id_probe_ufs(struct volume_id *id /*,uint64_t off*/); 225//int FAST_FUNC volume_id_probe_ufs(struct volume_id *id /*,uint64_t off*/);
226 226
227int volume_id_probe_xfs(struct volume_id *id /*,uint64_t off*/); 227int FAST_FUNC volume_id_probe_xfs(struct volume_id *id /*,uint64_t off*/);
228 228
229POP_SAVED_FUNCTION_VISIBILITY 229POP_SAVED_FUNCTION_VISIBILITY
diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c
index 389074c35..1017d077b 100644
--- a/util-linux/volume_id/xfs.c
+++ b/util-linux/volume_id/xfs.c
@@ -35,7 +35,7 @@ struct xfs_super_block {
35 uint64_t fdblocks; 35 uint64_t fdblocks;
36} PACKED; 36} PACKED;
37 37
38int volume_id_probe_xfs(struct volume_id *id /*,uint64_t off*/) 38int FAST_FUNC volume_id_probe_xfs(struct volume_id *id /*,uint64_t off*/)
39{ 39{
40#define off ((uint64_t)0) 40#define off ((uint64_t)0)
41 struct xfs_super_block *xs; 41 struct xfs_super_block *xs;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 07:39:42 +0000