[Cluster-devel] [PATCH 04/23] gfs2_edit: Don't use the global block variable in block_is_inum_file

[Andrew Price <anprice@redhat.com>]

Accept it as an argument instead.

Signed-off-by: Andrew Price <anprice@redhat.com>
---
 gfs2/edit/extended.c | 2 +-
 gfs2/edit/hexedit.c  | 9 +++------
 gfs2/edit/hexedit.h  | 2 +-
 gfs2/edit/savemeta.c | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/gfs2/edit/extended.c b/gfs2/edit/extended.c
index b9d77f8..8c7244b 100644
--- a/gfs2/edit/extended.c
+++ b/gfs2/edit/extended.c
@@ -693,7 +693,7 @@ int display_extended(void)
 		inode_put(&tmp_inode);
 		brelse(tmp_bh);
 	}
-	else if (block_is_inum_file()) {
+	else if (block_is_inum_file(block)) {
 		tmp_bh = bread(&sbd, block);
 		tmp_inode = lgfs2_inode_get(&sbd, tmp_bh);
 		if (tmp_inode == NULL)
diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index cf13304..6125d04 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -897,12 +897,9 @@ int block_is_jindex(uint64_t blk)
 	return FALSE;
 }
 
-/* ------------------------------------------------------------------------ */
-/* block_is_inum_file                                                       */
-/* ------------------------------------------------------------------------ */
-int block_is_inum_file(void)
+int block_is_inum_file(uint64_t blk)
 {
-	if (!sbd.gfs1 && block == masterblock("inum"))
+	if (!sbd.gfs1 && blk == masterblock("inum"))
 		return TRUE;
 	return FALSE;
 }
@@ -951,7 +948,7 @@ static int block_has_extended_info(void)
 	    block_is_rgtree() ||
 	    block_is_journals() ||
 	    block_is_jindex(block) ||
-	    block_is_inum_file() ||
+	    block_is_inum_file(block) ||
 	    block_is_statfs_file() ||
 	    block_is_quota_file())
 		return TRUE;
diff --git a/gfs2/edit/hexedit.h b/gfs2/edit/hexedit.h
index 745e026..f229ed4 100644
--- a/gfs2/edit/hexedit.h
+++ b/gfs2/edit/hexedit.h
@@ -220,7 +220,7 @@ void die(const char *fmt, ...)
 
 extern int block_is_jindex(uint64_t blk);
 extern int block_is_rindex(void);
-extern int block_is_inum_file(void);
+extern int block_is_inum_file(uint64_t blk);
 extern int block_is_statfs_file(void);
 extern int block_is_quota_file(void);
 extern int block_is_per_node(void);
diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
index dc2c3d7..ab4fe0e 100644
--- a/gfs2/edit/savemeta.c
+++ b/gfs2/edit/savemeta.c
@@ -166,7 +166,7 @@ static int init_per_node_lookup(void)
 
 static int block_is_systemfile(void)
 {
-	return block_is_jindex(block) || block_is_inum_file() ||
+	return block_is_jindex(block) || block_is_inum_file(block) ||
 		block_is_statfs_file() || block_is_quota_file() ||
 		block_is_rindex() || block_is_a_journal(block) ||
 		block_is_per_node() || block_is_in_per_node(block);
-- 
2.4.3