Gitweb:
http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=4f726bc8...
Commit: 4f726bc88e633ec825c3a22ecead5834862dec53
Parent: ae21ffa7efaf24bd14e715545d5a6cce316b13e3
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Wed Feb 3 15:56:11 2016 +0000
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Wed Feb 3 15:56:11 2016 +0000
gfs2_edit: Don't use the global block variable in save_indirect_blocks
Accept the block's owner's address as an argument instead.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
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 33d618a..7c7e504 100644
--- a/gfs2/edit/savemeta.c
+++ b/gfs2/edit/savemeta.c
@@ -495,7 +495,7 @@ static void save_ea_block(struct metafd *mfd, struct gfs2_buffer_head
*metabh)
* save_indirect_blocks - save all indirect blocks for the given buffer
*/
static void save_indirect_blocks(struct metafd *mfd, osi_list_t *cur_list,
- struct gfs2_buffer_head *mybh, int height, int hgt)
+ struct gfs2_buffer_head *mybh, uint64_t owner, int height, int hgt)
{
uint64_t old_block = 0, indir_block;
uint64_t *ptr;
@@ -514,7 +514,7 @@ static void save_indirect_blocks(struct metafd *mfd, osi_list_t
*cur_list,
if (indir_block == old_block)
continue;
old_block = indir_block;
- blktype = save_block(sbd.device_fd, mfd, indir_block, block);
+ blktype = save_block(sbd.device_fd, mfd, indir_block, owner);
if (blktype == GFS2_METATYPE_EA) {
nbh = bread(&sbd, indir_block);
save_ea_block(mfd, nbh);
@@ -589,7 +589,7 @@ static void save_inode_data(struct metafd *mfd)
mybh = osi_list_entry(tmp, struct gfs2_buffer_head,
b_altlist);
warm_fuzzy_stuff(block, FALSE);
- save_indirect_blocks(mfd, cur_list, mybh,
+ save_indirect_blocks(mfd, cur_list, mybh, block,
height, i);
} /* for blocks at that height */
} /* for height */
@@ -641,7 +641,7 @@ static void save_inode_data(struct metafd *mfd)
save_ea_block(mfd, lbh);
else if (mh.mh_magic == GFS2_MAGIC &&
mh.mh_type == GFS2_METATYPE_IN)
- save_indirect_blocks(mfd, cur_list, lbh, 2, 2);
+ save_indirect_blocks(mfd, cur_list, lbh, block, 2, 2);
else {
if (mh.mh_magic == GFS2_MAGIC) /* if it's metadata */
save_block(sbd.device_fd, mfd,