This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch master in repository gfs2-utils.
commit 1c1060b5595dbd77f85e5a6d77bbc8749fdef714 Author: Andrew Price anprice@redhat.com AuthorDate: Thu Nov 25 12:58:11 2021 +0000
fsck.gfs2: Rename rg_repair() to rindex_repair()
To be more consistent with what it does and to differentiate it from the rg_repair() function in gfs2_edit.
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/fsck/fsck.h | 2 +- gfs2/fsck/initialize.c | 2 +- gfs2/fsck/rgrepair.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h index 91ef23d1..f6c7d1dd 100644 --- a/gfs2/fsck/fsck.h +++ b/gfs2/fsck/fsck.h @@ -124,7 +124,7 @@ extern int pass2(struct gfs2_sbd *sdp); extern int pass3(struct gfs2_sbd *sdp); extern int pass4(struct gfs2_sbd *sdp); extern int pass5(struct gfs2_sbd *sdp, struct gfs2_bmap *bl); -extern int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *ok); +extern int rindex_repair(struct gfs2_sbd *sdp, int trust_lvl, int *ok); extern int fsck_query(const char *format, ...) __attribute__((format(printf,1,2))); extern struct dir_info *dirtree_find(uint64_t block); diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c index 9ba4bc89..86f032e7 100644 --- a/gfs2/fsck/initialize.c +++ b/gfs2/fsck/initialize.c @@ -730,7 +730,7 @@ static int fetch_rgrps_level(struct gfs2_sbd *sdp, enum rgindex_trust_level lvl,
log_notice(_("Level %d resource group check: %s.\n"), lvl + 1, level_desc[lvl]);
- if (rg_repair(sdp, lvl, ok) != 0) + if (rindex_repair(sdp, lvl, ok) != 0) goto fail;
if (rindex_read(sdp, count, ok) != 0 || !*ok) diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c index c9384ac8..3163f17f 100644 --- a/gfs2/fsck/rgrepair.c +++ b/gfs2/fsck/rgrepair.c @@ -946,7 +946,7 @@ static int expect_rindex_sanity(struct gfs2_sbd *sdp, int *num_rgs) }
/* - * rg_repair - try to repair a damaged rg index (rindex) + * rindex_repair - try to repair a damaged rg index (rindex) * trust_lvl - This is how much we trust the rindex file. * BLIND_FAITH means we take the rindex at face value. * OPEN_MINDED means it might be okay, but we should verify it. @@ -956,7 +956,7 @@ static int expect_rindex_sanity(struct gfs2_sbd *sdp, int *num_rgs) * was converted from GFS via gfs2_convert, and its rgrps are * not on nice boundaries thanks to previous gfs_grow ops. Lovely. */ -int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *ok) +int rindex_repair(struct gfs2_sbd *sdp, int trust_lvl, int *ok) { struct osi_node *n, *next = NULL, *e, *enext; int error, discrepancies, percent;