This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch andyp-fsck_cx
in repository gfs2-utils.
commit fb6cb271c3b3f41603dc4fbf503765f3bb2e6cfd
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Mon Aug 1 10:25:44 2022 +0100
fsck.gfs2: Pass fsck_cx into rebuild_master()
Fix up some nomenclature while we're at it.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/fsck/initialize.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index 26f4d33a..7c7ea3ca 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -430,18 +430,16 @@ static void check_rgrps_integrity(struct fsck_cx *cx)
}
}
-/**
- * rebuild_master - rebuild a destroyed master directory
- */
-static int rebuild_master(struct lgfs2_sbd *sdp)
+static int rebuild_sysdir(struct fsck_cx *cx)
{
+ struct lgfs2_sbd *sdp = cx->sdp;
struct lgfs2_inum inum;
struct lgfs2_buffer_head *bh = NULL;
int err = 0;
- log_err(_("The system master directory seems to be destroyed.\n"));
+ log_err(_("The system directory seems to be destroyed.\n"));
if (!query(_("Okay to rebuild it? (y/n)"))) {
- log_err(_("System master not rebuilt; aborting.\n"));
+ log_err(_("System directory not rebuilt; aborting.\n"));
return -1;
}
log_err(_("Trying to rebuild the master directory.\n"));
@@ -1618,7 +1616,7 @@ int initialize(struct fsck_cx *cx, int *all_clean)
sdp->master_dir->i_mh_type != GFS2_METATYPE_DI ||
!sdp->master_dir->i_size)) {
lgfs2_inode_put(&sdp->master_dir);
- rebuild_master(sdp);
+ rebuild_sysdir(cx);
sdp->master_dir = lgfs2_inode_read(sdp, sdp->sd_meta_dir.in_addr);
if (sdp->master_dir == NULL) {
log_crit(_("Error reading master directory: %s\n"), strerror(errno));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.