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

[Andrew Price]

Accept it as an argument instead.

Signed-off-by: Andrew Price <anprice at redhat.com>
---
 gfs2/edit/savemeta.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
index 8ac035c..0dff85a 100644
--- a/gfs2/edit/savemeta.c
+++ b/gfs2/edit/savemeta.c
@@ -64,12 +64,12 @@ static int journals_found = 0;
 int print_level = MSG_NOTICE;
 extern char *device;
 
-static int block_is_a_journal(void)
+static int block_is_a_journal(uint64_t blk)
 {
 	int j;
 
 	for (j = 0; j < journals_found; j++)
-		if (block == journal_blocks[j])
+		if (blk == journal_blocks[j])
 			return TRUE;
 	return FALSE;
 }
@@ -168,7 +168,7 @@ static int block_is_systemfile(void)
 {
 	return block_is_jindex() || block_is_inum_file() ||
 		block_is_statfs_file() || block_is_quota_file() ||
-		block_is_rindex() || block_is_a_journal() ||
+		block_is_rindex() || block_is_a_journal(block) ||
 		block_is_per_node() || block_is_in_per_node();
 }
 
-- 
2.4.3