7:09 a.m.
This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch master
in repository gfs2-utils.
commit 46e46fa18b02c4fa696e81ea250f6c177b0c883f
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Tue Sep 15 12:03:46 2020 +0100
mkfs.gfs2: Make sure the last rg_skip is 0
The rg_skip field of the last resource group is meant to be zero. Ensure
that gfs2_grow and mkfs.gfs2 set it that way once the resource groups
have been written, using a new lgfs2_rgrps_write_final() function that
is called once we know that there are no more resource groups to write.
Tests included, which required adding code to create temporary sparse
files for unit tests to use.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/libgfs2/check_rgrp.c | 70 +++++++++++++++++++++++++++++++++++++++--------
gfs2/libgfs2/libgfs2.h | 1 +
gfs2/libgfs2/rgrp.c | 19 ++++++++++++-
gfs2/mkfs/main_grow.c | 4 +++
gfs2/mkfs/main_mkfs.c | 5 +++-
tests/rgskipcheck.sh | 9 +++++-
6 files changed, 93 insertions(+), 15 deletions(-)
diff --git a/gfs2/libgfs2/check_rgrp.c b/gfs2/libgfs2/check_rgrp.c
index 4cf0175..98650e2 100644
--- a/gfs2/libgfs2/check_rgrp.c
+++ b/gfs2/libgfs2/check_rgrp.c
@@ -1,6 +1,13 @@
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
#include <check.h>
#include "libgfs2.h"
-#include "rgrp.h" /* Private header libgfs2/rgrp.h for convenience */
+#include "rgrp.h"
+
+/* Keep this size small enough to run on most build machines and large enough
+ that we can create several resource groups. */
+#define MOCK_DEV_SIZE (1 << 30)
Suite *suite_rgrp(void);
@@ -13,14 +20,20 @@ static void mockup_rgrps(void)
uint64_t addr;
struct gfs2_rindex ri = {0};
lgfs2_rgrp_t rg;
- uint32_t rgsize = (1024 << 20) / 4096;
+ uint32_t rgsize = (100 << 20) / 4096;
+ char tmpnam[] = "mockdev-XXXXXX";
int ret;
sdp = calloc(1, sizeof(*sdp));
ck_assert(sdp != NULL);
- sdp->device.length = rgsize + 20;
- sdp->device_fd = -1;
+ sdp->device.length = MOCK_DEV_SIZE / 4096;
+
+ sdp->device_fd = mkstemp(tmpnam);
+ ck_assert(sdp->device_fd >= 0);
+ ck_assert(unlink(tmpnam) == 0);
+ ck_assert(ftruncate(sdp->device_fd, MOCK_DEV_SIZE) == 0);
+
sdp->bsize = sdp->sd_sb.sb_bsize = 4096;
compute_constants(sdp);
@@ -44,6 +57,7 @@ static void mockup_rgrps(void)
static void teardown_rgrps(void)
{
+ close(tc_rgrps->sdp->device_fd);
free(tc_rgrps->sdp);
lgfs2_rgrp_bitbuf_free(lgfs2_rgrp_first(tc_rgrps));
lgfs2_rgrps_free(&tc_rgrps);
@@ -115,18 +129,50 @@ START_TEST(test_rbm_find_lastblock)
}
END_TEST
+START_TEST(test_rgrps_write_final)
+{
+ lgfs2_rgrp_t rg = lgfs2_rgrp_last(tc_rgrps);
+ uint64_t addr = lgfs2_rgrp_index(rg)->ri_addr;
+ struct gfs2_sbd *sdp = tc_rgrps->sdp;
+ struct gfs2_rgrp rgrp;
+ char *buf;
+
+ buf = malloc(4096);
+ ck_assert(buf != NULL);
+ memset(buf, 0xff, sizeof(rgrp));
+ ck_assert(pwrite(sdp->device_fd, buf, 4096, addr * 4096) == 4096);
+
+ ck_assert(lgfs2_rgrps_write_final(sdp->device_fd, tc_rgrps) == 0);
+ ck_assert(pread(sdp->device_fd, buf, 4096, addr * 4096) == 4096);
+ gfs2_rgrp_in(&rgrp, buf);
+ free(buf);
+
+ ck_assert(rgrp.rg_header.mh_magic == GFS2_MAGIC);
+ ck_assert(rgrp.rg_header.mh_type == GFS2_METATYPE_RG);
+ ck_assert(rgrp.rg_skip == 0);
+
+ ck_assert(lgfs2_rgrps_write_final(-1, tc_rgrps) == -1);
+}
+END_TEST
+
Suite *suite_rgrp(void)
{
Suite *s = suite_create("rgrp.c");
-
- TCase *tc_rbm_find = tcase_create("rbm_find");
- tcase_add_checked_fixture(tc_rbm_find, mockup_rgrps, teardown_rgrps);
- tcase_add_test(tc_rbm_find, test_rbm_find_good);
- tcase_add_test(tc_rbm_find, test_rbm_find_bad);
- tcase_add_test(tc_rbm_find, test_rbm_find_lastblock);
- tcase_set_timeout(tc_rbm_find, 0);
- suite_add_tcase(s, tc_rbm_find);
+ TCase *tc;
+
+ tc = tcase_create("rbm_find");
+ tcase_add_checked_fixture(tc, mockup_rgrps, teardown_rgrps);
+ tcase_add_test(tc, test_rbm_find_good);
+ tcase_add_test(tc, test_rbm_find_bad);
+ tcase_add_test(tc, test_rbm_find_lastblock);
+ tcase_set_timeout(tc, 0);
+ suite_add_tcase(s, tc);
+
+ tc = tcase_create("lgfs2_rgrps_write_final");
+ tcase_add_checked_fixture(tc, mockup_rgrps, teardown_rgrps);
+ tcase_add_test(tc, test_rgrps_write_final);
+ suite_add_tcase(s, tc);
return s;
}
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 54c7009..e815b5d 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -201,6 +201,7 @@ extern lgfs2_rgrp_t lgfs2_rgrps_append(lgfs2_rgrps_t rgs, struct
gfs2_rindex *en
extern int lgfs2_rgrp_bitbuf_alloc(lgfs2_rgrp_t rg);
extern void lgfs2_rgrp_bitbuf_free(lgfs2_rgrp_t rg);
extern int lgfs2_rgrp_write(int fd, lgfs2_rgrp_t rg);
+extern int lgfs2_rgrps_write_final(int fd, lgfs2_rgrps_t rgs);
extern const struct gfs2_rindex *lgfs2_rgrp_index(lgfs2_rgrp_t rg);
extern const struct gfs2_rgrp *lgfs2_rgrp_rgrp(lgfs2_rgrp_t rg);
extern lgfs2_rgrp_t lgfs2_rgrp_first(lgfs2_rgrps_t rgs);
diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c
index 7f7f83f..a985e1c 100644
--- a/gfs2/libgfs2/rgrp.c
+++ b/gfs2/libgfs2/rgrp.c
@@ -692,7 +692,7 @@ int lgfs2_rgrp_write(int fd, const lgfs2_rgrp_t rg)
if (rg->rgrps->align > 0)
len = ROUND_UP(len, rg->rgrps->align * sdp->bsize);
- ret = pwrite(sdp->device_fd, rg->bits[0].bi_data, len, rg->ri.ri_addr *
sdp->bsize);
+ ret = pwrite(fd, rg->bits[0].bi_data, len, rg->ri.ri_addr * sdp->bsize);
if (freebufs)
lgfs2_rgrp_bitbuf_free(rg);
@@ -700,6 +700,23 @@ int lgfs2_rgrp_write(int fd, const lgfs2_rgrp_t rg)
return ret == len ? 0 : -1;
}
+/**
+ * Write the final resource group with rg_skip == 0.
+ * If there is no bitmap data attached to the rg then the block after the
+ * header will be zeroed.
+ * fd: The file descriptor to write to
+ * rgs: The set of resource groups
+ */
+int lgfs2_rgrps_write_final(int fd, lgfs2_rgrps_t rgs)
+{
+ lgfs2_rgrp_t rg = lgfs2_rgrp_last(rgs);
+
+ rg->rg.rg_skip = 0;
+ if (lgfs2_rgrp_write(fd, rg) != 0)
+ return -1;
+ return 0;
+}
+
lgfs2_rgrp_t lgfs2_rgrp_first(lgfs2_rgrps_t rgs)
{
return (lgfs2_rgrp_t)osi_first(&rgs->root);
diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c
index f527cc8..e1a6d70 100644
--- a/gfs2/mkfs/main_grow.c
+++ b/gfs2/mkfs/main_grow.c
@@ -234,6 +234,10 @@ static unsigned initialize_new_portion(struct gfs2_sbd *sdp,
lgfs2_rgrps_t rgs)
}
rgcount++;
}
+ if (lgfs2_rgrps_write_final(sdp->device_fd, rgs) != 0) {
+ perror(_("Failed to write final resource group"));
+ return 0;
+ }
fsync(sdp->device_fd);
return rgcount;
}
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index 0b77959..325d534 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -859,9 +859,12 @@ static int place_rgrps(struct gfs2_sbd *sdp, lgfs2_rgrps_t rgs,
uint64_t *rgaddr
fprintf(stderr, _("Failed to build resource groups\n"));
return result;
}
-
gfs2_progress_update(&progress, (sdp->rgrps));
}
+ if (lgfs2_rgrps_write_final(sdp->device_fd, rgs) != 0) {
+ perror(_("Failed to write final resource group"));
+ return 0;
+ }
gfs2_progress_close(&progress, _("Done\n"));
posix_fadvise(sdp->device_fd, 0, sdp->fssize * sdp->bsize,
POSIX_FADV_DONTNEED);
diff --git a/tests/rgskipcheck.sh b/tests/rgskipcheck.sh
index 4a8f93f..e8b56c7 100755
--- a/tests/rgskipcheck.sh
+++ b/tests/rgskipcheck.sh
@@ -4,7 +4,14 @@ dev=$1
rgcount=$(gfs2_edit -p rgcount $dev | cut -f1 -d' ')
prevaddr=$(gfs2_edit -p rg 0 $dev | grep ^RG | awk '{print $5}')
prevskip=0
-for i in `seq 0 $(($rgcount - 1))`; do
+for i in `seq 0 $(($rgcount))`; do
+ if [ $i -eq $rgcount ]; then
+ if [ $prevskip -ne 0 ]; then
+ echo "Last rg_skip is not 0 ($prevskip)" >&2
+ exit 1
+ fi
+ exit 0
+ fi
addr=$(gfs2_edit -p rg $i $dev | grep ^RG | awk '{print $5}')
expected=$(($addr - $prevaddr))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.