cluster: RHEL55 - Revert "gfs2_convert: Fix conversion of inodes with different heights on gfs1 and gfs2"
Abhijith Das
adas at fedoraproject.org
Tue Dec 1 15:07:40 UTC 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f91d20e041226664ac5f99dc7ff3f4ef575497c7
Commit: f91d20e041226664ac5f99dc7ff3f4ef575497c7
Parent: cc35bcd38a317291dc0a4c0f4a732074478dd00e
Author: Abhijith Das <adas at redhat.com>
AuthorDate: Tue Dec 1 09:06:52 2009 -0600
Committer: Abhijith Das <adas at redhat.com>
CommitterDate: Tue Dec 1 09:06:52 2009 -0600
Revert "gfs2_convert: Fix conversion of inodes with different heights on gfs1 and gfs2"
This reverts commit cc35bcd38a317291dc0a4c0f4a732074478dd00e.
Didn't follow commit guidelines for RHEL55, so reverting.
---
gfs2/convert/gfs2_convert.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index cea8496..e624ace 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -289,7 +289,7 @@ void mp_gfs1_to_gfs2(struct gfs2_sbd *sbp, int gfs1_h, int gfs2_h,
/* figure out multiplication factors for each height - gfs2 */
memset(&gfs2factor, 0, sizeof(gfs2factor));
- gfs2factor[gfs2_h - 1] = 1ull;
+ gfs2factor[gfs1_h - 1] = 1ull;
for (h = gfs2_h - 1; h > 0; h--)
gfs2factor[h - 1] = gfs2factor[h] * gfs2_inptrs;
@@ -577,7 +577,6 @@ int adjust_indirect_blocks(struct gfs2_sbd *sbp, struct gfs2_buffer_head *dibh,
blk->mp.mp_list[di_height - 1] = ptrnum;
mp_gfs1_to_gfs2(sbp, di_height, gfs2_hgt, &blk->mp, &gfs2mp);
memcpy(&blk->mp, &gfs2mp, sizeof(struct metapath));
- blk->height -= di_height - gfs2_hgt;
if (len)
fix_metatree(sbp, ip, blk, ptr1, len);
osi_list_del(tmp);
More information about the cluster-commits
mailing list