Gitweb:
http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=648a5d7c...
Commit: 648a5d7c208bc9e342db31b1c79f019f448b5295
Parent: e095bebc69475ff9b9369ef9350d7cc7eb50d47d
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Fri Feb 12 14:53:10 2016 -0500
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Thu Feb 25 11:00:19 2016 -0500
fsck.gfs2: Ditch variable rgcount_from_index
This patch eliminates variable rgcount_from_index from function
rg_repair. It wasn't really being used anyway. The important count
of resource groups from the rindex is sdp->rgrps, so use that
instead. Also, eliminate setting that from the calculated
number of rgrps. We've already got calc_rg_count for that.
Signed-off-by: Bob Peterson <rpeterso(a)redhat.com>
---
gfs2/fsck/rgrepair.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
index 5bf82db..6e56f91 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -880,7 +880,7 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int
*sane)
{
struct osi_node *n, *next = NULL, *e, *enext;
int error, discrepancies, percent;
- int calc_rg_count = 0, rgcount_from_index, rg;
+ int calc_rg_count = 0, rg;
struct gfs2_rindex buf;
if (trust_lvl == blind_faith)
@@ -919,7 +919,6 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int
*sane)
gfs2_rgrp_free(&sdp->rgcalc);
return -1;
}
- sdp->rgrps = calc_rg_count;
} else if (trust_lvl == indignation) { /* If we can't trust anything */
/* Free previous incarnations in memory, if any. */
gfs2_rgrp_free(&sdp->rgtree);
@@ -930,11 +929,10 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count,
int *sane)
gfs2_rgrp_free(&sdp->rgcalc);
return -1;
}
- sdp->rgrps = calc_rg_count;
}
/* Read in the rindex */
sdp->rgtree.osi_node = NULL; /* Just to be safe */
- rindex_read(sdp, 0, &rgcount_from_index, sane);
+ rindex_read(sdp, 0, &sdp->rgrps, sane);
if (sdp->md.riinode->i_di.di_size % sizeof(struct gfs2_rindex)) {
log_warn( _("WARNING: rindex file is corrupt.\n"));
gfs2_rgrp_free(&sdp->rgcalc);