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

volume_id: enable minix detection

Browse Source 
function                                             old     new   delta
volume_id_probe_minix                                  -      87     +87
fs2                                                   64      68      +4
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 1/0 up/down: 91/0)               Total: 91 bytes

Patch by wdlkmpx <wdlkmpx@gmail.com>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-25 14:22:08 +02:00
parent 5c123ac208
commit 73c47f6c41
3 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
util-linux/volume_id/unused_minix.c → util-linux/volume_id/minix.c
View File

@ -17,13 +17,12 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o
//config:### config FEATURE_VOLUMEID_MINIX
//config:### bool "minix filesystem"
//config:### default y
//config:### depends on VOLUMEID
#include "volume_id_internal.h" #include "volume_id_internal.h"
@ -40,43 +39,53 @@ struct minix_super_block {
uint32_t s_zones; uint32_t s_zones;
} PACKED; } PACKED;
/* 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 #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 minix_super_block *ms;
struct minix3_super_block *ms3;
dbg("probing at offset 0x%llx", (unsigned long long) off); dbg("probing at offset 0x%llx", (unsigned long long) off);
ms = volume_id_get_buffer(id, off + MINIX_SUPERBLOCK_OFFSET, 0x200); ms = volume_id_get_buffer(id, off + MINIX_SUPERBLOCK_OFFSET, 0x200);
if (ms == NULL) if (ms == NULL)
return -1; return -1;
if (ms->s_magic == cpu_to_le16(0x137F)) /* minix V1 fs, 14 char names */
if (ms->s_magic == cpu_to_le16(0x137f)) {
// id->type_version[0] = '1';
goto found; goto found;
} if (ms->s_magic == cpu_to_le16(0x138F)) /* minix V1 fs, 30 char names */
if (ms->s_magic == cpu_to_le16(0x1387)) {
// id->type_version[0] = '1';
goto found; goto found;
} if (ms->s_magic == cpu_to_le16(0x2468)) /* minix V2 fs, 14 char names */
if (ms->s_magic == cpu_to_le16(0x2468)) {
// id->type_version[0] = '2';
goto found; 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; goto found;
}
return -1; return -1;
found: found:
// id->type_version[1] = '\0';
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM); // volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
// id->type = "minix"; IF_FEATURE_BLKID_TYPE(id->type = "minix";)
return 0; return 0;
} }

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

@ -42,7 +42,6 @@
#define ENABLE_FEATURE_VOLUMEID_VIARAID 0 #define ENABLE_FEATURE_VOLUMEID_VIARAID 0
/* These filesystems also have no label or uuid: */ /* These filesystems also have no label or uuid: */
#define ENABLE_FEATURE_VOLUMEID_MINIX 0
#define ENABLE_FEATURE_VOLUMEID_HPFS 0 #define ENABLE_FEATURE_VOLUMEID_HPFS 0
#define ENABLE_FEATURE_VOLUMEID_UFS 0 #define ENABLE_FEATURE_VOLUMEID_UFS 0

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

@ -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_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*/); //int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/);