aboutsummaryrefslogtreecommitdiff
path: root/util-linux/volume_id/minix.c
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux/volume_id/minix.c')
-rw-r--r--util-linux/volume_id/minix.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/util-linux/volume_id/minix.c b/util-linux/volume_id/minix.c
index ede23cb24..2f5209333 100644
--- a/util-linux/volume_id/minix.c
+++ b/util-linux/volume_id/minix.c
@@ -20,8 +20,7 @@
20 20
21#include "volume_id_internal.h" 21#include "volume_id_internal.h"
22 22
23struct minix_super_block 23struct minix_super_block {
24{
25 uint16_t s_ninodes; 24 uint16_t s_ninodes;
26 uint16_t s_nzones; 25 uint16_t s_nzones;
27 uint16_t s_imap_blocks; 26 uint16_t s_imap_blocks;
@@ -46,31 +45,31 @@ int volume_id_probe_minix(struct volume_id *id, uint64_t off)
46 if (ms == NULL) 45 if (ms == NULL)
47 return -1; 46 return -1;
48 47
49 if (le16_to_cpu(ms->s_magic) == 0x137f) { 48 if (ms->s_magic == cpu_to_le16(0x137f)) {
50 id->type_version[0] = '1'; 49// id->type_version[0] = '1';
51 goto found; 50 goto found;
52 } 51 }
53 52
54 if (le16_to_cpu(ms->s_magic) == 0x1387) { 53 if (ms->s_magic == cpu_to_le16(0x1387)) {
55 id->type_version[0] = '1'; 54// id->type_version[0] = '1';
56 goto found; 55 goto found;
57 } 56 }
58 57
59 if (le16_to_cpu(ms->s_magic) == 0x2468) { 58 if (ms->s_magic == cpu_to_le16(0x2468)) {
60 id->type_version[0] = '2'; 59// id->type_version[0] = '2';
61 goto found; 60 goto found;
62 } 61 }
63 62
64 if (le16_to_cpu(ms->s_magic) == 0x2478) { 63 if (ms->s_magic == cpu_to_le16(0x2478)) {
65 id->type_version[0] = '2'; 64// id->type_version[0] = '2';
66 goto found; 65 goto found;
67 } 66 }
68 67
69 return -1; 68 return -1;
70 69
71 found: 70 found:
72 id->type_version[1] = '\0'; 71// id->type_version[1] = '\0';
73 volume_id_set_usage(id, VOLUME_ID_FILESYSTEM); 72// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
74 id->type = "minix"; 73// id->type = "minix";
75 return 0; 74 return 0;
76} 75}