cluster: RHEL55 - Revert "gfs2_convert: interrupted rgrp conversion does not allow re-converts"

Abhijith Das adas at fedoraproject.org
Mon Dec 21 17:40:49 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4a1e13adcb7d5380b676380cc555d04f7b30a836
Commit:        4a1e13adcb7d5380b676380cc555d04f7b30a836
Parent:        84babaef6376740c882ef1f51ce0b8cf9f15abba
Author:        Abhijith Das <adas at redhat.com>
AuthorDate:    Mon Dec 21 11:39:27 2009 -0600
Committer:     Abhijith Das <adas at redhat.com>
CommitterDate: Mon Dec 21 11:39:27 2009 -0600

Revert "gfs2_convert: interrupted rgrp conversion does not allow re-converts"

This reverts commit 84babaef6376740c882ef1f51ce0b8cf9f15abba.
---
 gfs2/convert/gfs2_convert.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index e624ace..1b4b1bd 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -219,9 +219,6 @@ static int convert_rgs(struct gfs2_sbd *sbp)
 		/* rg_freemeta is a gfs1 structure, so libgfs2 doesn't know to */
 		/* convert from be to cpu. We must do it now. */
 		rgd->rg.rg_free = rgd1->rg_free + be32_to_cpu(rgd1->rg_freemeta);
-		/* Zero it out so we don't add it again in case something breaks */
-		/* later on in the process and we have to re-run convert */
-		rgd1->rg_freemeta = 0;
 
 		sbp->blks_total += rgd->ri.ri_data;
 		sbp->blks_alloced += (rgd->ri.ri_data - rgd->rg.rg_free);


More information about the cluster-commits mailing list