[gfs2-utils] 06/10: Update some variable names for consistency

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch master
in repository gfs2-utils.

commit 5a8b7d3e1063ef3730c5aa28530a7d5c5da89990
Author: Andrew Price 
AuthorDate: Mon Mar 22 12:17:04 2021 +0000

Update some variable names for consistency

Signed-off-by: Andrew Price 
---
 gfs2/edit/hexedit.c  | 4 ++--
 gfs2/fsck/fsck.h     | 3 +--
 gfs2/fsck/rgrepair.c | 6 +++---
 gfs2/libgfs2/gfs2l.c | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index bd3f0abc..d07437bb 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -972,11 +972,11 @@ static int read_rindex(void)
 {
    struct gfs2_rindex *ri;
    uint64_t count;
-	int sane;
+	int ok;

sbd.fssize = sbd.device.length;
    if (sbd.md.riinode) /* If we found the rindex */
-		rindex_read(&sbd, &count, &sane);
+		rindex_read(&sbd, &count, &ok);

if (!OSI_EMPTY_ROOT(&sbd.rgtree)) {
    	ri = &((struct rgrp_tree *)osi_last(&sbd.rgtree))->ri;
diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h
index 13dd7b37..418ea889 100644
--- a/gfs2/fsck/fsck.h
+++ b/gfs2/fsck/fsck.h
@@ -130,8 +130,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 *rg_count,
-		     int *sane);
+extern int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, 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/rgrepair.c b/gfs2/fsck/rgrepair.c
index dd0b1fa5..6628d905 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -980,7 +980,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 *rg_count, int *sane)
+int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *ok)
 {
    struct osi_node *n, *next = NULL, *e, *enext;
    int error, discrepancies, percent;
@@ -993,7 +993,7 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane)
    	/* Don't free previous incarnations in memory, if any.
    	 * We need them to copy in the next function:
    	 * gfs2_rgrp_free(&sdp->rglist); */
-		if (!(*sane)) {
+		if (!(*ok)) {
    		log_err(_("The rindex file does not meet our "
    			  "expectations.\n"));
    		return -1;
@@ -1036,7 +1036,7 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane)
    }
    /* Read in the rindex */
    sdp->rgtree.osi_node = NULL; /* Just to be safe */
-	rindex_read(sdp, &sdp->rgrps, sane);
+	rindex_read(sdp, &sdp->rgrps, ok);
    if (sdp->md.riinode->i_di.di_size % sizeof(struct gfs2_rindex)) {
    	log_warn( _("WARNING: rindex file has an invalid size.\n"));
    	if (!query( _("Truncate the rindex size? (y/n)"))) {
diff --git a/gfs2/libgfs2/gfs2l.c b/gfs2/libgfs2/gfs2l.c
index 567b3b89..e582a193 100644
--- a/gfs2/libgfs2/gfs2l.c
+++ b/gfs2/libgfs2/gfs2l.c
@@ -101,7 +101,7 @@ static int openfs(const char *path, struct gfs2_sbd *sdp)
 {
    int fd;
    int ret;
-	int sane;
+	int ok;
    uint64_t count;

fd = open(path, O_RDWR);
@@ -135,7 +135,7 @@ static int openfs(const char *path, struct gfs2_sbd *sdp)
    gfs2_lookupi(sdp->master_dir, "rindex", 6, &sdp->md.riinode);
    sdp->fssize = sdp->device.length;
    if (sdp->md.riinode) {
-		rindex_read(sdp, &count, &sane);
+		rindex_read(sdp, &count, &ok);
    } else {
    	perror("Failed to look up rindex");
    	return 1;