emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

volume_id: add FAST_FUNC where appropriate

Browse Source 
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>
This commit is contained in:
Denys Vlasenko 2009-11-01 23:07:18 +01:00
parent 662e8b79d0
commit 893009644f
32 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util-linux/volume_id/btrfs.c
View File

@ -78,7 +78,7 @@ struct btrfs_super_block {
// ... // ...
} PACKED; } PACKED;
int volume_id_probe_btrfs(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_btrfs(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t) (64 * 1024)) #define off ((uint64_t) (64 * 1024))
struct btrfs_super_block *sb; struct btrfs_super_block *sb;

2
util-linux/volume_id/cramfs.c
View File

@ -35,7 +35,7 @@ struct cramfs_super {
uint8_t name[16]; uint8_t name[16];
} PACKED; } PACKED;
int volume_id_probe_cramfs(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_cramfs(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct cramfs_super *cs; struct cramfs_super *cs;

2
util-linux/volume_id/ext.c
View File

@ -43,7 +43,7 @@ struct ext2_super_block {
#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x00000008 #define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x00000008
#define EXT_SUPERBLOCK_OFFSET 0x400 #define EXT_SUPERBLOCK_OFFSET 0x400
int volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct ext2_super_block *es; struct ext2_super_block *es;

2
util-linux/volume_id/fat.c
View File

@ -119,7 +119,7 @@ static uint8_t *get_attr_volume_id(struct vfat_dir_entry *dir, int count)
return NULL; return NULL;
} }
int volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partition_off*/) int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partition_off*/)
{ {
#define fat_partition_off ((uint64_t)0) #define fat_partition_off ((uint64_t)0)
struct vfat_super_block *vs; struct vfat_super_block *vs;

2
util-linux/volume_id/hfs.c
View File

@ -131,7 +131,7 @@ struct hfsplus_vol_header {
#define HFS_NODE_LEAF 0xff #define HFS_NODE_LEAF 0xff
#define HFSPLUS_POR_CNID 1 #define HFSPLUS_POR_CNID 1
int volume_id_probe_hfs_hfsplus(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_hfs_hfsplus(struct volume_id *id /*,uint64_t off*/)
{ {
uint64_t off = 0; uint64_t off = 0;
unsigned blocksize; unsigned blocksize;

2
util-linux/volume_id/iso9660.c
View File

@ -47,7 +47,7 @@ struct high_sierra_volume_descriptor {
uint8_t version; uint8_t version;
} PACKED; } PACKED;
int volume_id_probe_iso9660(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_iso9660(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
uint8_t *buf; uint8_t *buf;

2
util-linux/volume_id/jfs.c
View File

@ -35,7 +35,7 @@ struct jfs_super_block {
#define JFS_SUPERBLOCK_OFFSET 0x8000 #define JFS_SUPERBLOCK_OFFSET 0x8000
int volume_id_probe_jfs(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_jfs(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct jfs_super_block *js; struct jfs_super_block *js;

2
util-linux/volume_id/linux_raid.c
View File

@ -42,7 +42,7 @@ struct mdp_super_block {
#define MD_RESERVED_BYTES 0x10000 #define MD_RESERVED_BYTES 0x10000
#define MD_MAGIC 0xa92b4efc #define MD_MAGIC 0xa92b4efc
int volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size) int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
uint64_t sboff; uint64_t sboff;

2
util-linux/volume_id/linux_swap.c
View File

@ -31,7 +31,7 @@ struct swap_header_v1_2 {
#define LARGEST_PAGESIZE 0x4000 #define LARGEST_PAGESIZE 0x4000
int volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct swap_header_v1_2 *sw; struct swap_header_v1_2 *sw;

2
util-linux/volume_id/luks.c
View File

@ -80,7 +80,7 @@ struct BUG_bad_size_luks_phdr {
1 : -1]; 1 : -1];
}; };
int volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct luks_phdr *header; struct luks_phdr *header;

2
util-linux/volume_id/ntfs.c
View File

@ -84,7 +84,7 @@ struct volume_info {
#define MFT_RECORD_ATTR_OBJECT_ID 0x40 #define MFT_RECORD_ATTR_OBJECT_ID 0x40
#define MFT_RECORD_ATTR_END 0xffffffffu #define MFT_RECORD_ATTR_END 0xffffffffu
int volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
unsigned sector_size; unsigned sector_size;

2
util-linux/volume_id/ocfs2.c
View File

@ -80,7 +80,7 @@ struct ocfs2_super_block {
uint8_t s_uuid[OCFS2_VOL_UUID_LEN]; /* 128-bit uuid */ uint8_t s_uuid[OCFS2_VOL_UUID_LEN]; /* 128-bit uuid */
} PACKED; } PACKED;
int volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct ocfs2_super_block *os; struct ocfs2_super_block *os;

2
util-linux/volume_id/reiserfs.c
View File

@ -48,7 +48,7 @@ struct reiser4_super_block {
#define REISERFS1_SUPERBLOCK_OFFSET 0x2000 #define REISERFS1_SUPERBLOCK_OFFSET 0x2000
#define REISERFS_SUPERBLOCK_OFFSET 0x10000 #define REISERFS_SUPERBLOCK_OFFSET 0x10000
int volume_id_probe_reiserfs(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_reiserfs(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct reiserfs_super_block *rs; struct reiserfs_super_block *rs;

2
util-linux/volume_id/romfs.c
View File

@ -27,7 +27,7 @@ struct romfs_super {
uint8_t name[]; uint8_t name[];
} PACKED; } PACKED;
int volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct romfs_super *rfs; struct romfs_super *rfs;

2
util-linux/volume_id/sysv.c
View File

@ -82,7 +82,7 @@ struct xenix_super {
#define XENIX_MAGIC 0x2b5544 #define XENIX_MAGIC 0x2b5544
#define SYSV_MAX_BLOCKSIZE 0x800 #define SYSV_MAX_BLOCKSIZE 0x800
int volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct sysv_super *vs; struct sysv_super *vs;

2
util-linux/volume_id/udf.c
View File

@ -55,7 +55,7 @@ struct volume_structure_descriptor {
#define UDF_VSD_OFFSET 0x8000 #define UDF_VSD_OFFSET 0x8000
int volume_id_probe_udf(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_udf(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct volume_descriptor *vd; struct volume_descriptor *vd;

4
util-linux/volume_id/unused_highpoint.c
View File

@ -37,7 +37,7 @@ struct hpt45x_meta {
#define HPT45X_MAGIC_BAD 0x5a7816fd #define HPT45X_MAGIC_BAD 0x5a7816fd
int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off) int FAST_FUNC volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off)
{ {
struct hpt37x_meta *hpt; struct hpt37x_meta *hpt;
uint32_t magic; uint32_t magic;
@ -58,7 +58,7 @@ int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off)
return 0; return 0;
} }
int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size) int FAST_FUNC volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size)
{ {
struct hpt45x_meta *hpt; struct hpt45x_meta *hpt;
uint64_t meta_off; uint64_t meta_off;

2
util-linux/volume_id/unused_hpfs.c
View File

@ -27,7 +27,7 @@ struct hpfs_super {
#define HPFS_SUPERBLOCK_OFFSET 0x2000 #define HPFS_SUPERBLOCK_OFFSET 0x2000
int volume_id_probe_hpfs(struct volume_id *id, uint64_t off) int FAST_FUNC volume_id_probe_hpfs(struct volume_id *id, uint64_t off)
{ {
struct hpfs_super *hs; struct hpfs_super *hs;

2
util-linux/volume_id/unused_isw_raid.c
View File

@ -31,7 +31,7 @@ struct isw_meta {
#define ISW_SIGNATURE "Intel Raid ISM Cfg Sig. " #define ISW_SIGNATURE "Intel Raid ISM Cfg Sig. "
int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size) int FAST_FUNC volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size)
{ {
uint64_t meta_off; uint64_t meta_off;
struct isw_meta *isw; struct isw_meta *isw;

2
util-linux/volume_id/unused_lsi_raid.c
View File

@ -26,7 +26,7 @@ struct lsi_meta {
#define LSI_SIGNATURE "$XIDE$" #define LSI_SIGNATURE "$XIDE$"
int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size) int FAST_FUNC volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size)
{ {
uint64_t meta_off; uint64_t meta_off;
struct lsi_meta *lsi; struct lsi_meta *lsi;

4
util-linux/volume_id/unused_lvm.c
View File

@ -34,7 +34,7 @@ struct lvm2_super_block {
#define LVM1_SB_OFF 0x400 #define LVM1_SB_OFF 0x400
int volume_id_probe_lvm1(struct volume_id *id, uint64_t off) int FAST_FUNC volume_id_probe_lvm1(struct volume_id *id, uint64_t off)
{ {
struct lvm1_super_block *lvm; struct lvm1_super_block *lvm;
@ -56,7 +56,7 @@ int volume_id_probe_lvm1(struct volume_id *id, uint64_t off)
#define LVM2_LABEL_ID "LABELONE" #define LVM2_LABEL_ID "LABELONE"
#define LVM2LABEL_SCAN_SECTORS 4 #define LVM2LABEL_SCAN_SECTORS 4
int volume_id_probe_lvm2(struct volume_id *id, uint64_t off) int FAST_FUNC volume_id_probe_lvm2(struct volume_id *id, uint64_t off)
{ {
const uint8_t *buf; const uint8_t *buf;
unsigned soff; unsigned soff;

2
util-linux/volume_id/unused_mac.c
View File

@ -36,7 +36,7 @@ struct mac_partition {
uint8_t type[32]; uint8_t type[32];
} PACKED; } PACKED;
int volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off) int FAST_FUNC volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off)
{ {
const uint8_t *buf; const uint8_t *buf;
struct mac_driver_desc *driver; struct mac_driver_desc *driver;

2
util-linux/volume_id/unused_minix.c
View File

@ -35,7 +35,7 @@ struct minix_super_block {
#define MINIX_SUPERBLOCK_OFFSET 0x400 #define MINIX_SUPERBLOCK_OFFSET 0x400
int volume_id_probe_minix(struct volume_id *id, uint64_t off) int FAST_FUNC volume_id_probe_minix(struct volume_id *id, uint64_t off)
{ {
struct minix_super_block *ms; struct minix_super_block *ms;

2
util-linux/volume_id/unused_msdos.c
View File

@ -47,7 +47,7 @@ struct msdos_partition_entry {
#define is_raid(type) \ #define is_raid(type) \
(type == LINUX_RAID_PARTITION) (type == LINUX_RAID_PARTITION)
int volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t off) int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t off)
{ {
const uint8_t *buf; const uint8_t *buf;
int i; int i;

2
util-linux/volume_id/unused_nvidia_raid.c
View File

@ -29,7 +29,7 @@ struct nvidia_meta {
#define NVIDIA_SIGNATURE "NVIDIA" #define NVIDIA_SIGNATURE "NVIDIA"
int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size) int FAST_FUNC volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size)
{ {
uint64_t meta_off; uint64_t meta_off;
struct nvidia_meta *nv; struct nvidia_meta *nv;

2
util-linux/volume_id/unused_promise_raid.c
View File

@ -27,7 +27,7 @@ struct promise_meta {
#define PDC_CONFIG_OFF 0x1200 #define PDC_CONFIG_OFF 0x1200
#define PDC_SIGNATURE "Promise Technology, Inc." #define PDC_SIGNATURE "Promise Technology, Inc."
int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size) int FAST_FUNC volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size)
{ {
static const unsigned short sectors[] = { static const unsigned short sectors[] = {
63, 255, 256, 16, 399 63, 255, 256, 16, 399

2
util-linux/volume_id/unused_silicon_raid.c
View File

@ -41,7 +41,7 @@ struct silicon_meta {
#define SILICON_MAGIC 0x2F000000 #define SILICON_MAGIC 0x2F000000
int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint64_t size) int FAST_FUNC volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint64_t size)
{ {
uint64_t meta_off; uint64_t meta_off;
struct silicon_meta *sil; struct silicon_meta *sil;

2
util-linux/volume_id/unused_ufs.c
View File

@ -162,7 +162,7 @@ struct ufs_super_block {
#define UFS_MAGIC_FEA 0x00195612 #define UFS_MAGIC_FEA 0x00195612
#define UFS_MAGIC_LFN 0x00095014 #define UFS_MAGIC_LFN 0x00095014
int volume_id_probe_ufs(struct volume_id *id, uint64_t off) int FAST_FUNC volume_id_probe_ufs(struct volume_id *id, uint64_t off)
{ {
static const short offsets[] = { 0, 8, 64, 256 }; static const short offsets[] = { 0, 8, 64, 256 };

2
util-linux/volume_id/unused_via_raid.c
View File

@ -36,7 +36,7 @@ struct via_meta {
#define VIA_SIGNATURE 0xAA55 #define VIA_SIGNATURE 0xAA55
int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size) int FAST_FUNC volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size)
{ {
uint64_t meta_off; uint64_t meta_off;
struct via_meta *via; struct via_meta *via;

12
util-linux/volume_id/volume_id.c
View File

@ -45,8 +45,8 @@
#define ENABLE_FEATURE_VOLUMEID_UFS 0 #define ENABLE_FEATURE_VOLUMEID_UFS 0
typedef int (*raid_probe_fptr)(struct volume_id *id, /*uint64_t off,*/ uint64_t size); typedef int FAST_FUNC (*raid_probe_fptr)(struct volume_id *id, /*uint64_t off,*/ uint64_t size);
typedef int (*probe_fptr)(struct volume_id *id /*, uint64_t off*/); typedef int FAST_FUNC (*probe_fptr)(struct volume_id *id /*, uint64_t off*/);
static const raid_probe_fptr raid1[] = { static const raid_probe_fptr raid1[] = {
#if ENABLE_FEATURE_VOLUMEID_LINUXRAID #if ENABLE_FEATURE_VOLUMEID_LINUXRAID
@ -153,7 +153,7 @@ static const probe_fptr fs2[] = {
#endif #endif
}; };
int volume_id_probe_all(struct volume_id *id, /*uint64_t off,*/ uint64_t size) int FAST_FUNC volume_id_probe_all(struct volume_id *id, /*uint64_t off,*/ uint64_t size)
{ {
unsigned i; unsigned i;
@ -199,7 +199,7 @@ int volume_id_probe_all(struct volume_id *id, /*uint64_t off,*/ uint64_t size)
} }
/* open volume by device node */ /* open volume by device node */
struct volume_id *volume_id_open_node(int fd) struct volume_id* FAST_FUNC volume_id_open_node(int fd)
{ {
struct volume_id *id; struct volume_id *id;
@ -212,7 +212,7 @@ struct volume_id *volume_id_open_node(int fd)
#ifdef UNUSED #ifdef UNUSED
/* open volume by major/minor */ /* open volume by major/minor */
struct volume_id *volume_id_open_dev_t(dev_t devt) struct volume_id* FAST_FUNC volume_id_open_dev_t(dev_t devt)
{ {
struct volume_id *id; struct volume_id *id;
char *tmp_node[VOLUME_ID_PATH_MAX]; char *tmp_node[VOLUME_ID_PATH_MAX];
@ -232,7 +232,7 @@ struct volume_id *volume_id_open_dev_t(dev_t devt)
} }
#endif #endif
void free_volume_id(struct volume_id *id) void FAST_FUNC free_volume_id(struct volume_id *id)
{ {
if (id == NULL) if (id == NULL)
return; return;

70
util-linux/volume_id/volume_id_internal.h
View File

@ -83,9 +83,9 @@ struct volume_id {
// const char *type; // const char *type;
}; };
struct volume_id *volume_id_open_node(int fd); struct volume_id* FAST_FUNC volume_id_open_node(int fd);
int volume_id_probe_all(struct volume_id *id, /*uint64_t off,*/ uint64_t size); int FAST_FUNC volume_id_probe_all(struct volume_id *id, /*uint64_t off,*/ uint64_t size);
void free_volume_id(struct volume_id *id); void FAST_FUNC free_volume_id(struct volume_id *id);
/* util.h */ /* util.h */
@ -162,68 +162,68 @@ void volume_id_free_buffer(struct volume_id *id);
/* RAID */ /* RAID */
//int volume_id_probe_highpoint_37x_raid(struct volume_id *id /*,uint64_t off*/); //int FAST_FUNC volume_id_probe_highpoint_37x_raid(struct volume_id *id /*,uint64_t off*/);
//int volume_id_probe_highpoint_45x_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); //int FAST_FUNC volume_id_probe_highpoint_45x_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
//int volume_id_probe_intel_software_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); //int FAST_FUNC volume_id_probe_intel_software_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
int volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
//int volume_id_probe_lsi_mega_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); //int FAST_FUNC volume_id_probe_lsi_mega_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
//int volume_id_probe_nvidia_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); //int FAST_FUNC volume_id_probe_nvidia_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
//int volume_id_probe_promise_fasttrack_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); //int FAST_FUNC volume_id_probe_promise_fasttrack_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
//int volume_id_probe_silicon_medley_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); //int FAST_FUNC volume_id_probe_silicon_medley_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
//int volume_id_probe_via_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size); //int FAST_FUNC volume_id_probe_via_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size);
//int volume_id_probe_lvm1(struct volume_id *id /*,uint64_t off*/); //int FAST_FUNC volume_id_probe_lvm1(struct volume_id *id /*,uint64_t off*/);
//int volume_id_probe_lvm2(struct volume_id *id /*,uint64_t off*/); //int FAST_FUNC volume_id_probe_lvm2(struct volume_id *id /*,uint64_t off*/);
/* FS */ /* FS */
int volume_id_probe_btrfs(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_btrfs(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_cramfs(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_cramfs(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_vfat(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_hfs_hfsplus(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_hfs_hfsplus(struct volume_id *id /*,uint64_t off*/);
//int volume_id_probe_hpfs(struct volume_id *id /*,uint64_t off*/); //int FAST_FUNC volume_id_probe_hpfs(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_iso9660(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_iso9660(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_jfs(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_jfs(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/);
//int volume_id_probe_mac_partition_map(struct volume_id *id /*,uint64_t off*/); //int FAST_FUNC volume_id_probe_mac_partition_map(struct volume_id *id /*,uint64_t off*/);
//int volume_id_probe_minix(struct volume_id *id /*,uint64_t off*/); //int FAST_FUNC volume_id_probe_minix(struct volume_id *id /*,uint64_t off*/);
//int volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/); //int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_reiserfs(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_reiserfs(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_udf(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_udf(struct volume_id *id /*,uint64_t off*/);
//int volume_id_probe_ufs(struct volume_id *id /*,uint64_t off*/); //int FAST_FUNC volume_id_probe_ufs(struct volume_id *id /*,uint64_t off*/);
int volume_id_probe_xfs(struct volume_id *id /*,uint64_t off*/); int FAST_FUNC volume_id_probe_xfs(struct volume_id *id /*,uint64_t off*/);
POP_SAVED_FUNCTION_VISIBILITY POP_SAVED_FUNCTION_VISIBILITY

2
util-linux/volume_id/xfs.c
View File

@ -35,7 +35,7 @@ struct xfs_super_block {
uint64_t fdblocks; uint64_t fdblocks;
} PACKED; } PACKED;
int volume_id_probe_xfs(struct volume_id *id /*,uint64_t off*/) int FAST_FUNC volume_id_probe_xfs(struct volume_id *id /*,uint64_t off*/)
{ {
#define off ((uint64_t)0) #define off ((uint64_t)0)
struct xfs_super_block *xs; struct xfs_super_block *xs;