From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Peterson Date: Thu, 11 Aug 2011 17:16:48 -0400 (EDT) Subject: [Cluster-devel] [Patch 40/44] gfs2_edit savemeta: save_inode_data backwards for gfs1 Message-ID: <1863047360.544999.1313097408355.JavaMail.root@zmail06.collab.prod.int.phx2.redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit >From 6861c4a24df7120264e31848395059ce06181026 Mon Sep 17 00:00:00 2001 From: Bob Peterson Date: Wed, 10 Aug 2011 15:30:25 -0500 Subject: [PATCH 40/44] gfs2_edit savemeta: save_inode_data backwards for gfs1 The logic in "gfs2_edit savemeta" was wrong for saving inode blocks. This patch fixes the logic. rhbz#675723 --- gfs2/edit/savemeta.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 1587438..3c02616 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -123,9 +123,9 @@ static int get_gfs_struct_info(struct gfs2_buffer_head *lbh, int *block_type, break; case GFS2_METATYPE_DI: /* 4 (disk inode) */ if (sbd.gfs1) - inode = inode_get(&sbd, lbh); - else inode = gfs_inode_get(&sbd, lbh); + else + inode = inode_get(&sbd, lbh); if (S_ISDIR(inode->i_di.di_mode) || (sbd.gfs1 && inode->i_di.__pad1 == GFS_FILE_DIR)) *gstruct_len = sbd.bsize; @@ -457,9 +457,9 @@ static void save_inode_data(struct metafd *mfd) osi_list_init(&metalist[i]); metabh = bread(&sbd, block); if (sbd.gfs1) - inode = inode_get(&sbd, metabh); - else inode = gfs_inode_get(&sbd, metabh); + else + inode = inode_get(&sbd, metabh); height = inode->i_di.di_height; /* If this is a user inode, we don't follow to the file height. We stop one level less. That way we save off the indirect -- 1.7.4.4