minix: remove fs state

For v3 minix superblocks the state flag (s_state) has been removed, so drop it
from the structure in accordance with the kernel's representation.

Reported-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Davidlohr Bueso <dave@gnu.org>

diff --git a/disk-utils/minix.h b/disk-utils/minix.h
index fc1d1c05e94d3c24aa5798c6bba8ec339854ae1e..a13a2a4fcbf9a98780cdfe1e3a418e8fd363db9d 100644 (file)
--- a/disk-utils/minix.h
+++ b/disk-utils/minix.h
@@ -62,7 +62,6 @@ struct minix3_super_block {
        u16 s_pad2;
        u16 s_blocksize;
        u8  s_disk_version;
-        u16 s_state;
 };
 
 #define BLOCK_SIZE_BITS 10

diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 916dd1702cb8068d808a1a6a477324121b8ebea3..06d087e26273109e6f3d947e6cda254dba18e0c1 100644 (file)
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -160,11 +160,8 @@ static void check_mount(void) {
 static void super_set_state(void)
 {
        switch (fs_version) {
-       case 3:
-               Super3.s_state |= MINIX_VALID_FS;
-               Super3.s_state &= ~MINIX_ERROR_FS;
-               break;
-       default:
+       case 1:
+       case 2:
                Super.s_state |= MINIX_VALID_FS;
                Super.s_state &= ~MINIX_ERROR_FS;
                break;