Gitweb:
http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=785a372e...
Commit: 785a372e99344cf15cbd9e6d696b7c767624c951
Parent: 66b2ef1733727a7fed601392f025d706e9b0e620
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Wed Feb 3 15:18:42 2016 +0000
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Wed Feb 3 15:18:42 2016 +0000
gfs2_edit: Don't use the global block variable in block_is_journals
Accept it as an argument instead.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/edit/extended.c | 2 +-
gfs2/edit/hexedit.c | 2 +-
gfs2/edit/hexedit.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gfs2/edit/extended.c b/gfs2/edit/extended.c
index ced2412..7a517bf 100644
--- a/gfs2/edit/extended.c
+++ b/gfs2/edit/extended.c
@@ -662,7 +662,7 @@ int display_extended(void)
parse_rindex(tmp_inode, TRUE);
inode_put(&tmp_inode);
brelse(tmp_bh);
- } else if (block_is_journals()) {
+ } else if (block_is_journals(block)) {
if (sbd.gfs1)
block = sbd1->sb_jindex_di.no_addr;
else
diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index b4123a1..12deb13 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -934,7 +934,7 @@ static int block_has_extended_info(void)
if (has_indirect_blocks() ||
block_is_rindex(block) ||
block_is_rgtree(block) ||
- block_is_journals() ||
+ block_is_journals(block) ||
block_is_jindex(block) ||
block_is_inum_file(block) ||
block_is_statfs_file(block) ||
diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h
index 1f97631..ab4b41b 100644
--- a/gfs2/edit/hexedit.h
+++ b/gfs2/edit/hexedit.h
@@ -121,9 +121,9 @@ static inline int block_is_rgtree(uint64_t blk)
return FALSE;
}
-static inline int block_is_journals(void)
+static inline int block_is_journals(uint64_t blk)
{
- if (block == JOURNALS_DUMMY_BLOCK)
+ if (blk == JOURNALS_DUMMY_BLOCK)
return TRUE;
return FALSE;
}