mkfs.minix: fix v2/v3 .badblocks inode number for big endian

For minix v2/v3 on big endian systems the inode number of the unwanted
".badblocks" file was not set to zero. This was introduced when v3 was
added in a2657ae3.

Actually it did not seem to cause any problems but since we zero it out
at all we should do it correctly. Now we zero out the whole directory
entry (inclusive ".badblocks" file name, also for v1). Unfortunately we
have to update the test data checksums.

CC: Davidlohr Bueso <davidlohr@hp.com>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index b472242ed6dd338bd66de4ab391cf22499c8e5d3..24e618871b77e445a416255ec305c345492ffec1 100644 (file)
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -369,8 +369,7 @@ static void make_root_inode_v1(struct fs_control *ctl) {
        if (ctl->fs_bad_blocks)
                inode->i_size = 3 * ctl->fs_dirsize;
        else {
-               root_block[2 * ctl->fs_dirsize] = '\0';
-               root_block[2 * ctl->fs_dirsize + 1] = '\0';
+               memset(&root_block[2 * ctl->fs_dirsize], 0, ctl->fs_dirsize);
                inode->i_size = 2 * ctl->fs_dirsize;
        }
        inode->i_mode = S_IFDIR + 0755;
@@ -391,7 +390,7 @@ static void make_root_inode_v2_v3 (struct fs_control *ctl) {
        if (ctl->fs_bad_blocks)
                inode->i_size = 3 * ctl->fs_dirsize;
        else {
-               root_block[2 * ctl->fs_dirsize] = '\0';
+               memset(&root_block[2 * ctl->fs_dirsize], 0, ctl->fs_dirsize);
                inode->i_size = 2 * ctl->fs_dirsize;
        }
 

diff --git a/tests/expected/minix/fsck-images-check-blocks b/tests/expected/minix/fsck-images-check-blocks
index 883d1e81d967b4b109ed33ac6bd9e7820d8e9b46..fce90fd89b118d9f277c94ceb8c968f1d47a82ff 100644 (file)
--- a/tests/expected/minix/fsck-images-check-blocks
+++ b/tests/expected/minix/fsck-images-check-blocks
@@ -25,7 +25,5 @@ fsck return value: 0
 00001410  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 00001420  01 00 2e 2e 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 00001430  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
-00001440  00 00 2e 62 61 64 62 6c  6f 63 6b 73 00 00 00 00  |...badblocks....|
-00001450  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 *
 00004000

diff --git a/tests/expected/minix/fsck-images-v1c14 b/tests/expected/minix/fsck-images-v1c14
index b3301d983cfc0573066415357728f2d0d8cdf871..75e3310f2703062be7b362e7195789aec761f39f 100644 (file)
--- a/tests/expected/minix/fsck-images-v1c14
+++ b/tests/expected/minix/fsck-images-v1c14
@@ -23,7 +23,6 @@ fsck return value: 0
 *
 00001400  01 00 2e 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 00001410  01 00 2e 2e 00 00 00 00  00 00 00 00 00 00 00 00  |................|
-00001420  00 00 2e 62 61 64 62 6c  6f 63 6b 73 00 00 00 00  |...badblocks....|
-00001430  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00001420  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 *
 00004000

diff --git a/tests/expected/minix/fsck-images-v1c30 b/tests/expected/minix/fsck-images-v1c30
index 883d1e81d967b4b109ed33ac6bd9e7820d8e9b46..fce90fd89b118d9f277c94ceb8c968f1d47a82ff 100644 (file)
--- a/tests/expected/minix/fsck-images-v1c30
+++ b/tests/expected/minix/fsck-images-v1c30
@@ -25,7 +25,5 @@ fsck return value: 0
 00001410  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 00001420  01 00 2e 2e 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 00001430  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
-00001440  00 00 2e 62 61 64 62 6c  6f 63 6b 73 00 00 00 00  |...badblocks....|
-00001450  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 *
 00004000

diff --git a/tests/expected/minix/fsck-images-v2c14 b/tests/expected/minix/fsck-images-v2c14
index 5e155b7887ef3d254166d2f36c228075b5c5cf0d..e8bc4e35e354a10894e4db5875a7e5c8f5af0126 100644 (file)
--- a/tests/expected/minix/fsck-images-v2c14
+++ b/tests/expected/minix/fsck-images-v2c14
@@ -24,7 +24,6 @@ fsck return value: 0
 *
 00001400  01 00 2e 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 00001410  01 00 2e 2e 00 00 00 00  00 00 00 00 00 00 00 00  |................|
-00001420  00 00 2e 62 61 64 62 6c  6f 63 6b 73 00 00 00 00  |...badblocks....|
-00001430  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00001420  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 *
 00004000

diff --git a/tests/expected/minix/fsck-images-v2c30 b/tests/expected/minix/fsck-images-v2c30
index 5f35ed78f59bdd4ce98d2daeafc27d9a9dbe5b4b..0066e49488d73e29326668ffa8551ecb34a97e7b 100644 (file)
--- a/tests/expected/minix/fsck-images-v2c30
+++ b/tests/expected/minix/fsck-images-v2c30
@@ -26,7 +26,5 @@ fsck return value: 0
 00001410  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 00001420  01 00 2e 2e 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 00001430  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
-00001440  00 00 2e 62 61 64 62 6c  6f 63 6b 73 00 00 00 00  |...badblocks....|
-00001450  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 *
 00004000

diff --git a/tests/expected/minix/fsck-images-v3c60 b/tests/expected/minix/fsck-images-v3c60
index be2b54d0aeec0964f73b6799c922634b9f1196b6..89ac9c99d15e734bf65a9eb22a015ca4e2988efe 100644 (file)
--- a/tests/expected/minix/fsck-images-v3c60
+++ b/tests/expected/minix/fsck-images-v3c60
@@ -28,7 +28,4 @@ fsck return value: 0
 00001440  01 00 00 00 2e 2e 00 00  00 00 00 00 00 00 00 00  |................|
 00001450  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
 *
-00001480  00 00 00 00 2e 62 61 64  62 6c 6f 63 6b 73 00 00  |.....badblocks..|
-00001490  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
-*
 00004000