mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-01-05 03:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mkfs check for existing ScoutFS superblock

Browse Source 
We were checking for the wrong magic value.

We now need to use -f when running mkfs in run-tests for things to work.

Signed-off-by: Andy Grover <agrover@versity.com>
This commit is contained in:
Andy Grover
2021-01-13 16:32:20 -08:00
parent 7cac1e7136
commit 299062a456
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/run-tests.sh
View File

@@ -304,7 +304,7 @@ if [ -n "$T_UNMOUNT" ]; then
fi
if [ -n "$T_MKFS" ]; then
cmd scoutfs mkfs -Q "$T_QUORUM" "$T_META_DEVICE" "$T_DATA_DEVICE"
cmd scoutfs mkfs -Q "$T_QUORUM" "$T_META_DEVICE" "$T_DATA_DEVICE" -f
fi
if [ -n "$T_INSMOD" ]; then

2
utils/src/blkid.c
View File

@@ -71,7 +71,7 @@ static int check_bdev_scoutfs(int fd, char *devname, char *usage)
if (ret)
return ret;
if (le32_to_cpu(super->hdr.magic) == SCOUTFS_SUPER_MAGIC) {
if (le32_to_cpu(super->hdr.magic) == SCOUTFS_BLOCK_MAGIC_SUPER) {
fprintf(stderr, "%s: appears to contain an existing "
"ScoutFS superblock\n", devname);
ret = -EINVAL;