[gfs2-utils] 21/38: fsck.gfs2: allow rindex recovery when too many segments

[git repository hosting]

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

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

commit 9aee0d0d382f6ef02b0d35338c2cd7fe3b1f603b
Author: Bob Peterson <rpeterso(a)redhat.com&gt;
Date:   Fri Jan 13 14:36:56 2017 -0500

    fsck.gfs2: allow rindex recovery when too many segments
    
    Patch 0103dc0 (fsck.gfs2: Detect multiple rgrp grow segments) added
    an array of rgrp segments. If it found too many segments, it threw
    up its hands and gave up and refused to try to fix it. But in most
    cases, proceeding to fix the rgrps won't cause any harm, since the
    rgrps are checked for integrity anyway. This patch allows fsck to
    try to fix the rgrp corruption, even after the maximum number of
    rgrp segments has been reached.
    
    Signed-off-by: Bob Peterson <rpeterso(a)redhat.com&gt;
---
 gfs2/fsck/rgrepair.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
index 7479458..49bbad6 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -230,9 +230,8 @@ static int find_shortest_rgdist(struct gfs2_sbd *sdp, uint64_t
*dist_array,
 	}
 	if (gsegment >= MAX_RGSEGMENTS) {
 		log_err(_("Maximum number of rgrp grow segments reached.\n"));
-		log_err(_("This file system cannot be repaired with fsck.\n"));
-		gsegment = 0;
-		goto out;
+		log_err(_("This file system has more than %d resource "
+			  "group segments.\n"), MAX_RGSEGMENTS);
 	}
 	/* -------------------------------------------------------------- */
 	/* Sanity-check our first_rg_dist. If RG #2 got nuked, the        */
@@ -260,7 +259,6 @@ static int find_shortest_rgdist(struct gfs2_sbd *sdp, uint64_t
*dist_array,
 			   (unsigned long long)*dist_array);
 	} /* if first RG distance is within tolerance */
 
-out:
 	gfs2_special_free(&false_rgrps);
 	return gsegment;
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.