Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=c291aa2f413... Commit: c291aa2f413b70f2ad25d01edb9aacfbd7d1a5b6 Parent: 7d700ac0af30715683e3bf8a4d4bb4bc6417e905 Author: Andrew Price anprice@redhat.com AuthorDate: Wed Feb 3 14:44:39 2016 +0000 Committer: Andrew Price anprice@redhat.com CommitterDate: Wed Feb 3 14:44:39 2016 +0000
gfs2_edit: Don't use the global block variable in block_is_in_per_node
Accept it as an argument instead.
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/edit/savemeta.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index 0dff85a..196e2f4 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -92,14 +92,14 @@ static void destroy_per_node_lookup(void) } }
-static int block_is_in_per_node(void) +static int block_is_in_per_node(uint64_t blk) { struct per_node_node *pnp = (struct per_node_node *)per_node_tree.osi_node;
while (pnp) { - if (block < pnp->block) + if (blk < pnp->block) pnp = (struct per_node_node *)pnp->node.osi_left; - else if (block > pnp->block) + else if (blk > pnp->block) pnp = (struct per_node_node *)pnp->node.osi_right; else return 1; @@ -169,7 +169,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) || - block_is_per_node() || block_is_in_per_node(); + block_is_per_node() || block_is_in_per_node(block); }
/**
cluster-commits@lists.fedorahosted.org