diff options
| -rw-r--r-- | util-linux/volume_id/minix.c (renamed from util-linux/volume_id/unused_minix.c) | 59 | ||||
| -rw-r--r-- | util-linux/volume_id/volume_id.c | 1 | ||||
| -rw-r--r-- | util-linux/volume_id/volume_id_internal.h | 2 |
3 files changed, 35 insertions, 27 deletions
diff --git a/util-linux/volume_id/unused_minix.c b/util-linux/volume_id/minix.c index 443dbc272..c934f9ead 100644 --- a/util-linux/volume_id/unused_minix.c +++ b/util-linux/volume_id/minix.c @@ -17,13 +17,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +//config:config FEATURE_VOLUMEID_MINIX +//config: bool "minix filesystem" +//config: default y +//config: depends on VOLUMEID -//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o - -//config:### config FEATURE_VOLUMEID_MINIX -//config:### bool "minix filesystem" -//config:### default y -//config:### depends on VOLUMEID +//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o #include "volume_id_internal.h" @@ -40,43 +39,53 @@ struct minix_super_block { uint32_t s_zones; } PACKED; -#define MINIX_SUPERBLOCK_OFFSET 0x400 +/* V3 minix super-block data on disk */ +struct minix3_super_block { + uint32_t s_ninodes; + uint16_t s_pad0; + uint16_t s_imap_blocks; + uint16_t s_zmap_blocks; + uint16_t s_firstdatazone; + uint16_t s_log_zone_size; + uint16_t s_pad1; + uint32_t s_max_size; + uint32_t s_zones; + uint16_t s_magic; + uint16_t s_pad2; + uint16_t s_blocksize; + uint8_t s_disk_version; +} PACKED; + +#define MINIX_SUPERBLOCK_OFFSET 0x400 -int FAST_FUNC 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*/) { +#define off ((uint64_t)0) struct minix_super_block *ms; + struct minix3_super_block *ms3; dbg("probing at offset 0x%llx", (unsigned long long) off); ms = volume_id_get_buffer(id, off + MINIX_SUPERBLOCK_OFFSET, 0x200); if (ms == NULL) return -1; - - if (ms->s_magic == cpu_to_le16(0x137f)) { -// id->type_version[0] = '1'; + if (ms->s_magic == cpu_to_le16(0x137F)) /* minix V1 fs, 14 char names */ goto found; - } - - if (ms->s_magic == cpu_to_le16(0x1387)) { -// id->type_version[0] = '1'; + if (ms->s_magic == cpu_to_le16(0x138F)) /* minix V1 fs, 30 char names */ goto found; - } - - if (ms->s_magic == cpu_to_le16(0x2468)) { -// id->type_version[0] = '2'; + if (ms->s_magic == cpu_to_le16(0x2468)) /* minix V2 fs, 14 char names */ + goto found; + if (ms->s_magic == cpu_to_le16(0x2478)) /* minix V2 fs, 30 char names */ goto found; - } - if (ms->s_magic == cpu_to_le16(0x2478)) { -// id->type_version[0] = '2'; + ms3 = (void*)ms; + if (ms3->s_magic == cpu_to_le16(0x4d5a)) /* minix V3 fs, 60 char names */ goto found; - } return -1; found: -// id->type_version[1] = '\0'; // volume_id_set_usage(id, VOLUME_ID_FILESYSTEM); -// id->type = "minix"; + IF_FEATURE_BLKID_TYPE(id->type = "minix";) return 0; } diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c index 5bb95994b..85315ced6 100644 --- a/util-linux/volume_id/volume_id.c +++ b/util-linux/volume_id/volume_id.c @@ -42,7 +42,6 @@ #define ENABLE_FEATURE_VOLUMEID_VIARAID 0 /* These filesystems also have no label or uuid: */ -#define ENABLE_FEATURE_VOLUMEID_MINIX 0 #define ENABLE_FEATURE_VOLUMEID_HPFS 0 #define ENABLE_FEATURE_VOLUMEID_UFS 0 diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h index 759a832e6..0eaea9b34 100644 --- a/util-linux/volume_id/volume_id_internal.h +++ b/util-linux/volume_id/volume_id_internal.h @@ -193,7 +193,7 @@ int FAST_FUNC volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/); //int FAST_FUNC volume_id_probe_mac_partition_map(struct volume_id *id /*,uint64_t off*/); -//int FAST_FUNC 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 FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/); |