cluster: STABLE3 - Revert "gfs2_convert: Fix rgrp conversion to allow re-converts"

Abhijith Das adas at fedoraproject.org
Tue Dec 1 15:05:48 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0de10d10314cbc41f3c90705cfb1fdef1324da59
Commit:        0de10d10314cbc41f3c90705cfb1fdef1324da59
Parent:        2f25bbb8c35727bf880df12bd7b1ef68df9158d8
Author:        Abhijith Das <adas at redhat.com>
AuthorDate:    Tue Dec 1 09:02:09 2009 -0600
Committer:     Abhijith Das <adas at redhat.com>
CommitterDate: Tue Dec 1 09:04:56 2009 -0600

Revert "gfs2_convert: Fix rgrp conversion to allow re-converts"

This reverts commit 3f5a9f2d641a171344047d5f63b65d2c566ee168.

Didn't follow commit guidelines for RHEL55, so reverting.
---
 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 260d543..bc6312d 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -209,9 +209,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