diff options
28 files changed, 106 insertions, 106 deletions
diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile index 66b3b92f9d..f53e5f1141 100644 --- a/extras/volume_id/lib/Makefile +++ b/extras/volume_id/lib/Makefile @@ -13,7 +13,7 @@ INSTALL_DATA = ${INSTALL} -m 644 INSTALL_LIB = ${INSTALL} -m 755 SHLIB_CUR = 0 -SHLIB_REV = 67 +SHLIB_REV = 68 SHLIB_AGE = 0 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE) diff --git a/extras/volume_id/lib/cramfs.c b/extras/volume_id/lib/cramfs.c index 100ebdec22..bf329506e1 100644 --- a/extras/volume_id/lib/cramfs.c +++ b/extras/volume_id/lib/cramfs.c @@ -41,7 +41,7 @@ struct cramfs_super { uint8_t name[16]; } PACKED; -int volume_id_probe_cramfs(struct volume_id *id, uint64_t off) +int volume_id_probe_cramfs(struct volume_id *id, uint64_t off, uint64_t size) { struct cramfs_super *cs; diff --git a/extras/volume_id/lib/ext.c b/extras/volume_id/lib/ext.c index 7d41a3287e..8fc7a747dc 100644 --- a/extras/volume_id/lib/ext.c +++ b/extras/volume_id/lib/ext.c @@ -70,7 +70,7 @@ struct ext2_super_block { #define EXT3_MIN_BLOCK_SIZE 0x400 #define EXT3_MAX_BLOCK_SIZE 0x1000 -int volume_id_probe_ext(struct volume_id *id, uint64_t off) +int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size) { struct ext2_super_block *es; size_t bsize; diff --git a/extras/volume_id/lib/fat.c b/extras/volume_id/lib/fat.c index 61a9450438..92f316a275 100644 --- a/extras/volume_id/lib/fat.c +++ b/extras/volume_id/lib/fat.c @@ -133,7 +133,7 @@ static uint8_t *get_attr_volume_id(struct vfat_dir_entry *dir, unsigned int coun return NULL; } -int volume_id_probe_vfat(struct volume_id *id, uint64_t off) +int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size) { struct vfat_super_block *vs; struct vfat_dir_entry *dir; diff --git a/extras/volume_id/lib/gfs.c b/extras/volume_id/lib/gfs.c index 40a4493b32..1d3a4a0f1e 100644 --- a/extras/volume_id/lib/gfs.c +++ b/extras/volume_id/lib/gfs.c @@ -109,12 +109,12 @@ static int volume_id_probe_gfs_generic(struct volume_id *id, uint64_t off, int v return -1; } -int volume_id_probe_gfs(struct volume_id *id, uint64_t off) +int volume_id_probe_gfs(struct volume_id *id, uint64_t off, uint64_t size) { return volume_id_probe_gfs_generic(id, off, 1); } -int volume_id_probe_gfs2(struct volume_id *id, uint64_t off) +int volume_id_probe_gfs2(struct volume_id *id, uint64_t off, uint64_t size) { return volume_id_probe_gfs_generic(id, off, 2); } diff --git a/extras/volume_id/lib/hfs.c b/extras/volume_id/lib/hfs.c index 4e34d66ba4..03b2aa0819 100644 --- a/extras/volume_id/lib/hfs.c +++ b/extras/volume_id/lib/hfs.c @@ -137,7 +137,7 @@ static struct hfsplus_vol_header { #define HFS_NODE_LEAF 0xff #define HFSPLUS_POR_CNID 1 -int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off) +int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off, uint64_t size) { unsigned int blocksize; unsigned int cat_block; diff --git a/extras/volume_id/lib/highpoint.c b/extras/volume_id/lib/highpoint.c index e441edb776..f2c4069cc6 100644 --- a/extras/volume_id/lib/highpoint.c +++ b/extras/volume_id/lib/highpoint.c @@ -43,7 +43,7 @@ struct hpt45x_meta { #define HPT45X_MAGIC_BAD 0x5a7816fd -int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off) +int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off, uint64_t size) { const uint8_t *buf; struct hpt37x_meta *hpt; diff --git a/extras/volume_id/lib/hpfs.c b/extras/volume_id/lib/hpfs.c index 6fec9caf8d..edcf0666ae 100644 --- a/extras/volume_id/lib/hpfs.c +++ b/extras/volume_id/lib/hpfs.c @@ -34,7 +34,7 @@ struct hpfs_super #define HPFS_SUPERBLOCK_OFFSET 0x2000 -int volume_id_probe_hpfs(struct volume_id *id, uint64_t off) +int volume_id_probe_hpfs(struct volume_id *id, uint64_t off, uint64_t size) { struct hpfs_super *hs; diff --git a/extras/volume_id/lib/iso9660.c b/extras/volume_id/lib/iso9660.c index be64a8b8af..f8f5aa18ea 100644 --- a/extras/volume_id/lib/iso9660.c +++ b/extras/volume_id/lib/iso9660.c @@ -53,7 +53,7 @@ struct high_sierra_volume_descriptor { uint8_t version; } PACKED; -int volume_id_probe_iso9660(struct volume_id *id, uint64_t off) +int volume_id_probe_iso9660(struct volume_id *id, uint64_t off, uint64_t size) { uint8_t *buf; struct iso_volume_descriptor *is; diff --git a/extras/volume_id/lib/jfs.c b/extras/volume_id/lib/jfs.c index 80360915a4..6d4124cd05 100644 --- a/extras/volume_id/lib/jfs.c +++ b/extras/volume_id/lib/jfs.c @@ -41,7 +41,7 @@ struct jfs_super_block { #define JFS_SUPERBLOCK_OFFSET 0x8000 -int volume_id_probe_jfs(struct volume_id *id, uint64_t off) +int volume_id_probe_jfs(struct volume_id *id, uint64_t off, uint64_t size) { struct jfs_super_block *js; diff --git a/extras/volume_id/lib/libvolume_id.h b/extras/volume_id/lib/libvolume_id.h index e34f4679e7..98423f08cc 100644 --- a/extras/volume_id/lib/libvolume_id.h +++ b/extras/volume_id/lib/libvolume_id.h @@ -69,41 +69,41 @@ extern int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t siz extern void volume_id_close(struct volume_id *id); /* filesystems */ -extern int volume_id_probe_cramfs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_ext(struct volume_id *id, uint64_t off); -extern int volume_id_probe_vfat(struct volume_id *id, uint64_t off); -extern int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off); -extern int volume_id_probe_hpfs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_iso9660(struct volume_id *id, uint64_t off); -extern int volume_id_probe_jfs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_minix(struct volume_id *id, uint64_t off); -extern int volume_id_probe_ntfs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off); -extern int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off); -extern int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_romfs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_sysv(struct volume_id *id, uint64_t off); -extern int volume_id_probe_udf(struct volume_id *id, uint64_t off); -extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_squashfs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_netware(struct volume_id *id, uint64_t off); -extern int volume_id_probe_gfs(struct volume_id *id, uint64_t off); -extern int volume_id_probe_gfs2(struct volume_id *id, uint64_t off); +extern int volume_id_probe_cramfs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_hpfs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_iso9660(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_jfs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_minix(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_ntfs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_romfs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_sysv(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_udf(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_squashfs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_netware(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_gfs(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_gfs2(struct volume_id *id, uint64_t off, uint64_t size); /* special formats */ -extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off); -extern int volume_id_probe_luks(struct volume_id *id, uint64_t off); +extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_luks(struct volume_id *id, uint64_t off, uint64_t size); /* raid */ extern int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size); -extern int volume_id_probe_lvm1(struct volume_id *id, uint64_t off); -extern int volume_id_probe_lvm2(struct volume_id *id, uint64_t off); +extern int volume_id_probe_lvm1(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_lvm2(struct volume_id *id, uint64_t off, uint64_t size); /* bios raid */ extern int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size); -extern int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off); +extern int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off, uint64_t size); extern int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size); extern int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size); extern int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size); diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c index 3937f8ea46..21cb2bce8c 100644 --- a/extras/volume_id/lib/linux_swap.c +++ b/extras/volume_id/lib/linux_swap.c @@ -37,7 +37,7 @@ static struct swap_header_v1_2 { #define LARGEST_PAGESIZE 0x4000 -int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off) +int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size) { const uint8_t *buf; unsigned int page; diff --git a/extras/volume_id/lib/luks.c b/extras/volume_id/lib/luks.c index f3ec20eade..a141a0f5c3 100644 --- a/extras/volume_id/lib/luks.c +++ b/extras/volume_id/lib/luks.c @@ -62,7 +62,7 @@ struct luks_phdr { } keyblock[LUKS_NUMKEYS]; }; -int volume_id_probe_luks(struct volume_id *id, uint64_t off) +int volume_id_probe_luks(struct volume_id *id, uint64_t off, uint64_t size) { struct luks_phdr *header; diff --git a/extras/volume_id/lib/lvm.c b/extras/volume_id/lib/lvm.c index 727204280b..9c83c55307 100644 --- a/extras/volume_id/lib/lvm.c +++ b/extras/volume_id/lib/lvm.c @@ -41,7 +41,7 @@ struct lvm2_super_block { #define LVM1_SB_OFF 0x400 #define LVM1_MAGIC "HM" -int volume_id_probe_lvm1(struct volume_id *id, uint64_t off) +int volume_id_probe_lvm1(struct volume_id *id, uint64_t off, uint64_t size) { const uint8_t *buf; struct lvm1_super_block *lvm; @@ -66,7 +66,7 @@ int volume_id_probe_lvm1(struct volume_id *id, uint64_t off) #define LVM2_LABEL_ID "LABELONE" #define LVM2LABEL_SCAN_SECTORS 4 -int volume_id_probe_lvm2(struct volume_id *id, uint64_t off) +int volume_id_probe_lvm2(struct volume_id *id, uint64_t off, uint64_t size) { const uint8_t *buf; unsigned int soff; diff --git a/extras/volume_id/lib/minix.c b/extras/volume_id/lib/minix.c index c5e16e783b..dffc52a4d8 100644 --- a/extras/volume_id/lib/minix.c +++ b/extras/volume_id/lib/minix.c @@ -42,7 +42,7 @@ struct minix_super_block #define MINIX_SUPERBLOCK_OFFSET 0x400 -int volume_id_probe_minix(struct volume_id *id, uint64_t off) +int volume_id_probe_minix(struct volume_id *id, uint64_t off, uint64_t size) { struct minix_super_block *ms; diff --git a/extras/volume_id/lib/netware.c b/extras/volume_id/lib/netware.c index 6e1e95f86c..67af561331 100644 --- a/extras/volume_id/lib/netware.c +++ b/extras/volume_id/lib/netware.c @@ -78,7 +78,7 @@ struct netware_super_block { uint32_t reserved2[64-(2+46)]; } PACKED; -int volume_id_probe_netware(struct volume_id *id, uint64_t off) +int volume_id_probe_netware(struct volume_id *id, uint64_t off, uint64_t size) { struct netware_super_block *nw; diff --git a/extras/volume_id/lib/ntfs.c b/extras/volume_id/lib/ntfs.c index 5f2a5b93a2..f7675a3434 100644 --- a/extras/volume_id/lib/ntfs.c +++ b/extras/volume_id/lib/ntfs.c @@ -90,7 +90,7 @@ static struct volume_info { #define MFT_RECORD_ATTR_OBJECT_ID 0x40 #define MFT_RECORD_ATTR_END 0xffffffffu -int volume_id_probe_ntfs(struct volume_id *id, uint64_t off) +int volume_id_probe_ntfs(struct volume_id *id, uint64_t off, uint64_t size) { unsigned int sector_size; unsigned int cluster_size; diff --git a/extras/volume_id/lib/ocfs.c b/extras/volume_id/lib/ocfs.c index bf311415dd..349527b7e0 100644 --- a/extras/volume_id/lib/ocfs.c +++ b/extras/volume_id/lib/ocfs.c @@ -126,7 +126,7 @@ struct ocfs2_super_block { uint8_t s_uuid[16]; } PACKED; -int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off) +int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off, uint64_t size) { const uint8_t *buf; struct ocfs1_super_block_header *osh; @@ -164,7 +164,7 @@ int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off) #define OCFS2_MAX_BLOCKSIZE 0x1000 #define OCFS2_SUPER_BLOCK_BLKNO 2 -int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off) +int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off, uint64_t size) { const uint8_t *buf; struct ocfs2_super_block *os; diff --git a/extras/volume_id/lib/reiserfs.c b/extras/volume_id/lib/reiserfs.c index 770f726825..1f219e5bde 100644 --- a/extras/volume_id/lib/reiserfs.c +++ b/extras/volume_id/lib/reiserfs.c @@ -54,7 +54,7 @@ struct reiser4_super_block { #define REISERFS1_SUPERBLOCK_OFFSET 0x2000 #define REISERFS_SUPERBLOCK_OFFSET 0x10000 -int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off) +int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off, uint64_t size) { struct reiserfs_super_block *rs; struct reiser4_super_block *rs4; diff --git a/extras/volume_id/lib/romfs.c b/extras/volume_id/lib/romfs.c index a88781e36e..2db36d61a5 100644 --- a/extras/volume_id/lib/romfs.c +++ b/extras/volume_id/lib/romfs.c @@ -33,7 +33,7 @@ struct romfs_super { uint8_t name[0]; } PACKED; -int volume_id_probe_romfs(struct volume_id *id, uint64_t off) +int volume_id_probe_romfs(struct volume_id *id, uint64_t off, uint64_t size) { struct romfs_super *rfs; diff --git a/extras/volume_id/lib/squashfs.c b/extras/volume_id/lib/squashfs.c index fdba64edbc..99cc78aa41 100644 --- a/extras/volume_id/lib/squashfs.c +++ b/extras/volume_id/lib/squashfs.c @@ -32,7 +32,7 @@ struct squashfs_super { uint32_t s_magic; } PACKED; -int volume_id_probe_squashfs(struct volume_id *id, uint64_t off) +int volume_id_probe_squashfs(struct volume_id *id, uint64_t off, uint64_t size) { struct squashfs_super *sqs; diff --git a/extras/volume_id/lib/sysv.c b/extras/volume_id/lib/sysv.c index 6e0ed046f0..e48013c2bd 100644 --- a/extras/volume_id/lib/sysv.c +++ b/extras/volume_id/lib/sysv.c @@ -89,7 +89,7 @@ struct xenix_super { #define XENIX_MAGIC 0x2b5544 #define SYSV_MAX_BLOCKSIZE 0x800 -int volume_id_probe_sysv(struct volume_id *id, uint64_t off) +int volume_id_probe_sysv(struct volume_id *id, uint64_t off, uint64_t size) { struct sysv_super *vs; struct xenix_super *xs; diff --git a/extras/volume_id/lib/udf.c b/extras/volume_id/lib/udf.c index d71e9d6f5d..ac2f40a9e8 100644 --- a/extras/volume_id/lib/udf.c +++ b/extras/volume_id/lib/udf.c @@ -61,7 +61,7 @@ struct volume_structure_descriptor { #define UDF_VSD_OFFSET 0x8000 -int volume_id_probe_udf(struct volume_id *id, uint64_t off) +int volume_id_probe_udf(struct volume_id *id, uint64_t off, uint64_t size) { struct volume_descriptor *vd; struct volume_structure_descriptor *vsd; diff --git a/extras/volume_id/lib/ufs.c b/extras/volume_id/lib/ufs.c index 8255b6e791..2713a63d4d 100644 --- a/extras/volume_id/lib/ufs.c +++ b/extras/volume_id/lib/ufs.c @@ -168,7 +168,7 @@ struct ufs_super_block { #define UFS_MAGIC_FEA 0x00195612 #define UFS_MAGIC_LFN 0x00095014 -int volume_id_probe_ufs(struct volume_id *id, uint64_t off) +int volume_id_probe_ufs(struct volume_id *id, uint64_t off, uint64_t size) { uint32_t magic; int i; diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c index f74319fb96..c6c8d5af6d 100644 --- a/extras/volume_id/lib/volume_id.c +++ b/extras/volume_id/lib/volume_id.c @@ -77,13 +77,13 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size) goto found; } - if (volume_id_probe_lvm1(id, off) == 0) + if (volume_id_probe_lvm1(id, off, size) == 0) goto found; - if (volume_id_probe_lvm2(id, off) == 0) + if (volume_id_probe_lvm2(id, off, size) == 0) goto found; - if (volume_id_probe_highpoint_37x_raid(id, off) == 0) + if (volume_id_probe_highpoint_37x_raid(id, off, size) == 0) goto found; return -1; @@ -102,79 +102,79 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); - if (volume_id_probe_vfat(id, off) == 0) + if (volume_id_probe_vfat(id, off, size) == 0) goto found; /* fill buffer with maximum */ volume_id_get_buffer(id, 0, SB_BUFFER_SIZE); - if (volume_id_probe_linux_swap(id, off) == 0) + if (volume_id_probe_linux_swap(id, off, size) == 0) goto found; - if (volume_id_probe_luks(id, off) == 0) + if (volume_id_probe_luks(id, off, size) == 0) goto found; - if (volume_id_probe_xfs(id, off) == 0) + if (volume_id_probe_xfs(id, off, size) == 0) goto found; - if (volume_id_probe_ext(id, off) == 0) + if (volume_id_probe_ext(id, off, size) == 0) goto found; - if (volume_id_probe_reiserfs(id, off) == 0) + if (volume_id_probe_reiserfs(id, off, size) == 0) goto found; - if (volume_id_probe_jfs(id, off) == 0) + if (volume_id_probe_jfs(id, off, size) == 0) goto found; - if (volume_id_probe_udf(id, off) == 0) + if (volume_id_probe_udf(id, off, size) == 0) goto found; - if (volume_id_probe_iso9660(id, off) == 0) + if (volume_id_probe_iso9660(id, off, size) == 0) goto found; - if (volume_id_probe_hfs_hfsplus(id, off) == 0) + if (volume_id_probe_hfs_hfsplus(id, off, size) == 0) goto found; - if (volume_id_probe_ufs(id, off) == 0) + if (volume_id_probe_ufs(id, off, size) == 0) goto found; - if (volume_id_probe_ntfs(id, off) == 0) + if (volume_id_probe_ntfs(id, off, size) == 0) goto found; - if (volume_id_probe_cramfs(id, off) == 0) + if (volume_id_probe_cramfs(id, off, size) == 0) goto found; - if (volume_id_probe_romfs(id, off) == 0) + if (volume_id_probe_romfs(id, off, size) == 0) goto found; - if (volume_id_probe_hpfs(id, off) == 0) + if (volume_id_probe_hpfs(id, off, size) == 0) goto found; - if (volume_id_probe_sysv(id, off) == 0) + if (volume_id_probe_sysv(id, off, size) == 0) goto found; - if (volume_id_probe_minix(id, off) == 0) + if (volume_id_probe_minix(id, off, size) == 0) goto found; - if (volume_id_probe_ocfs1(id, off) == 0) + if (volume_id_probe_ocfs1(id, off, size) == 0) goto found; - if (volume_id_probe_ocfs2(id, off) == 0) + if (volume_id_probe_ocfs2(id, off, size) == 0) goto found; - if (volume_id_probe_vxfs(id, off) == 0) + if (volume_id_probe_vxfs(id, off, size) == 0) goto found; - if (volume_id_probe_squashfs(id, off) == 0) + if (volume_id_probe_squashfs(id, off, size) == 0) goto found; - if (volume_id_probe_netware(id, off) == 0) + if (volume_id_probe_netware(id, off, size) == 0) goto found; - if (volume_id_probe_gfs(id, off) == 0) + if (volume_id_probe_gfs(id, off, size) == 0) goto found; - if (volume_id_probe_gfs2(id, off) == 0) + if (volume_id_probe_gfs2(id, off, size) == 0) goto found; return -1; diff --git a/extras/volume_id/lib/vxfs.c b/extras/volume_id/lib/vxfs.c index 112666192c..c9b76285e8 100644 --- a/extras/volume_id/lib/vxfs.c +++ b/extras/volume_id/lib/vxfs.c @@ -33,7 +33,7 @@ struct vxfs_super { int32_t vs_version; } PACKED; -int volume_id_probe_vxfs(struct volume_id *id, uint64_t off) +int volume_id_probe_vxfs(struct volume_id *id, uint64_t off, uint64_t size) { struct vxfs_super *vxs; diff --git a/extras/volume_id/lib/xfs.c b/extras/volume_id/lib/xfs.c index 9228fe4c88..5c1a82e1d3 100644 --- a/extras/volume_id/lib/xfs.c +++ b/extras/volume_id/lib/xfs.c @@ -41,7 +41,7 @@ struct xfs_super_block { uint64_t fdblocks; } PACKED; -int volume_id_probe_xfs(struct volume_id *id, uint64_t off) +int volume_id_probe_xfs(struct volume_id *id, uint64_t off, uint64_t size) { struct xfs_super_block *xs; diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index d516eb5cbd..96ccaf3637 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -213,53 +213,53 @@ int main(int argc, char *argv[]) printf("%s\n", vid->type); if (volume_id_probe_jmicron_raid(vid, 0, size) == 0) printf("%s\n", vid->type); - if (volume_id_probe_vfat(vid, 0) == 0) + if (volume_id_probe_vfat(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_linux_swap(vid, 0) == 0) + if (volume_id_probe_linux_swap(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_luks(vid, 0) == 0) + if (volume_id_probe_luks(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_xfs(vid, 0) == 0) + if (volume_id_probe_xfs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_ext(vid, 0) == 0) + if (volume_id_probe_ext(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_reiserfs(vid, 0) == 0) + if (volume_id_probe_reiserfs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_jfs(vid, 0) == 0) + if (volume_id_probe_jfs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_udf(vid, 0) == 0) + if (volume_id_probe_udf(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_iso9660(vid, 0) == 0) + if (volume_id_probe_iso9660(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_hfs_hfsplus(vid, 0) == 0) + if (volume_id_probe_hfs_hfsplus(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_ufs(vid, 0) == 0) + if (volume_id_probe_ufs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_ntfs(vid, 0) == 0) + if (volume_id_probe_ntfs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_cramfs(vid, 0) == 0) + if (volume_id_probe_cramfs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_romfs(vid, 0) == 0) + if (volume_id_probe_romfs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_hpfs(vid, 0) == 0) + if (volume_id_probe_hpfs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_sysv(vid, 0) == 0) + if (volume_id_probe_sysv(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_minix(vid, 0) == 0) + if (volume_id_probe_minix(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_ocfs1(vid, 0) == 0) + if (volume_id_probe_ocfs1(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_ocfs2(vid, 0) == 0) + if (volume_id_probe_ocfs2(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_vxfs(vid, 0) == 0) + if (volume_id_probe_vxfs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_squashfs(vid, 0) == 0) + if (volume_id_probe_squashfs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_netware(vid, 0) == 0) + if (volume_id_probe_netware(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_gfs(vid, 0) == 0) + if (volume_id_probe_gfs(vid, 0, 0) == 0) printf("%s\n", vid->type); - if (volume_id_probe_gfs2(vid, 0) == 0) + if (volume_id_probe_gfs2(vid, 0, 0) == 0) printf("%s\n", vid->type); goto exit; |