Gitweb:
http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=78f88c81...
Commit: 78f88c8146354eeb9d34e6ec25f1a5c14ddd66c4
Parent: fb44aaf56881a16ab632beb57fd3c915426b73d1
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Wed Feb 3 16:29:58 2016 +0000
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Wed Feb 3 16:29:58 2016 +0000
gfs2_edit: Don't use the global block variable in save_allocated
Replace it with a local variable as save_allocated doesn't use its
existing value.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/edit/savemeta.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
index 47cabba..c376db4 100644
--- a/gfs2/edit/savemeta.c
+++ b/gfs2/edit/savemeta.c
@@ -714,6 +714,7 @@ static void get_journal_inode_blocks(void)
static void save_allocated(struct rgrp_tree *rgd, struct metafd *mfd)
{
int blktype;
+ uint64_t blk;
unsigned i, j, m;
uint64_t *ibuf = malloc(sbd.bsize * GFS2_NBBY * sizeof(uint64_t));
@@ -721,11 +722,11 @@ static void save_allocated(struct rgrp_tree *rgd, struct metafd
*mfd)
m = lgfs2_bm_scan(rgd, i, ibuf, GFS2_BLKST_DINODE);
for (j = 0; j < m; j++) {
- block = ibuf[j];
- warm_fuzzy_stuff(block, FALSE);
- blktype = save_block(sbd.device_fd, mfd, block, block);
+ blk = ibuf[j];
+ warm_fuzzy_stuff(blk, FALSE);
+ blktype = save_block(sbd.device_fd, mfd, blk, blk);
if (blktype == GFS2_METATYPE_DI)
- save_inode_data(mfd, block);
+ save_inode_data(mfd, blk);
}
if (!sbd.gfs1)
@@ -735,7 +736,7 @@ static void save_allocated(struct rgrp_tree *rgd, struct metafd *mfd)
* If we don't, we may run into metadata allocation issues. */
m = lgfs2_bm_scan(rgd, i, ibuf, GFS2_BLKST_UNLINKED);
for (j = 0; j < m; j++) {
- save_block(sbd.device_fd, mfd, block, block);
+ save_block(sbd.device_fd, mfd, blk, blk);
}
}
free(ibuf);