Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=7d700ac0af3... Commit: 7d700ac0af30715683e3bf8a4d4bb4bc6417e905 Parent: 821f7281291fa272ab8293c15a8e1882f538cf08 Author: Andrew Price anprice@redhat.com AuthorDate: Wed Feb 3 14:42:27 2016 +0000 Committer: Andrew Price anprice@redhat.com CommitterDate: Wed Feb 3 14:43:25 2016 +0000
gfs2_edit: Don't use the global block variable in block_is_a_journal
Accept it as an argument instead.
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/savemeta.c | 6 +++--- 1 files 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(); }
cluster-commits@lists.fedorahosted.org