[Cluster-devel] [Patch 31/44] fsck.gfs2: don't free previous rgrp list when trying to repair rgrps

[Bob Peterson <rpeterso@redhat.com>]

From 34c9992770cb54114e8806663526cb1baa235ecb Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Tue, 9 Aug 2011 15:51:34 -0500
Subject: [PATCH 31/44] fsck.gfs2: don't free previous rgrp list when trying
 to repair rgrps

In cases where fsck.gfs2 is trying to repair damaged resource groups or
rindex, it tries several levels of repair.  Some of those levels build a
list of expected resource groups and check them against the actual ones,
and the previous list is freed before the next level is attempted.
However, in the case of minor damage, such as one bitmap block that was
overwritten, we can often repair the damage by reading in the resource
groups at the first level, then at the second level of repair (called
"ye_of_little_faith") use those values to compare against.  This patch
allows the second level of repair to use the first level's list.

rhbz#675723
---
 gfs2/fsck/rgrepair.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
index 24badef..911aad3 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -784,12 +784,12 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane)
 	osi_list_t *exp, *act; /* expected, actual */
 	struct gfs2_rindex buf;
 
-	/* Free previous incarnations in memory, if any. */
-	gfs2_rgrp_free(&sdp->rglist);
-
 	if (trust_lvl == blind_faith)
 		return 0;
-	else if (trust_lvl == ye_of_little_faith) { /* if rindex seems sane */
+	if (trust_lvl == ye_of_little_faith) { /* if rindex seems 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)) {
 			log_err(_("The rindex file does not meet our "
 				  "expectations.\n"));
@@ -802,6 +802,9 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane)
 			return error;
 		}
 	} else if (trust_lvl == open_minded) { /* If we can't trust RG index */
+		/* Free previous incarnations in memory, if any. */
+		gfs2_rgrp_free(&sdp->rglist);
+
 		/* Calculate our own RG index for comparison */
 		error = gfs2_rindex_calculate(sdp, &expected_rglist,
 					      &calc_rg_count);
@@ -811,6 +814,9 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane)
 		}
 	}
 	else if (trust_lvl == distrust) { /* If we can't trust RG index */
+		/* Free previous incarnations in memory, if any. */
+		gfs2_rgrp_free(&sdp->rglist);
+
 		error = gfs2_rindex_rebuild(sdp, &expected_rglist,
 					    &calc_rg_count, 0);
 		if (error) {
@@ -821,6 +827,9 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane)
 		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->rglist);
+
 		error = gfs2_rindex_rebuild(sdp, &expected_rglist,
 					    &calc_rg_count, 1);
 		if (error) {
-- 
1.7.4.4