summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/rgrp.c
diff options
context:
space:
mode:
authorMichel Lespinasse <walken@google.com>2012-08-05 22:04:08 -0700
committerSteven Whitehouse <swhiteho@redhat.com>2012-09-24 10:47:02 +0100
commit24d634e8f3b43fe2eb7c7d66567de7aba8edc308 (patch)
treef37a096d512b09237892a829b5f4e81e72516c09 /fs/gfs2/rgrp.c
parent3b1d0b9d0b6f4b76293c8f30cc95aa946bd34150 (diff)
downloadop-kernel-dev-24d634e8f3b43fe2eb7c7d66567de7aba8edc308.zip
op-kernel-dev-24d634e8f3b43fe2eb7c7d66567de7aba8edc308.tar.gz
GFS2: Use RB_CLEAR_NODE() rather than rb_init_node()
gfs2 calls RB_EMPTY_NODE() to check if nodes are not on an rbtree. The corresponding initialization function is RB_CLEAR_NODE(). rb_init_node() was never clearly defined and is going away. Signed-off-by: Michel Lespinasse <walken@google.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/rgrp.c')
-rw-r--r--fs/gfs2/rgrp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 06476b3..7ce22d8 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -453,7 +453,7 @@ int gfs2_rs_alloc(struct gfs2_inode *ip)
if (!res)
error = -ENOMEM;
- rb_init_node(&res->rs_node);
+ RB_CLEAR_NODE(&res->rs_node);
down_write(&ip->i_rw_mutex);
if (ip->i_res)
@@ -486,7 +486,7 @@ static void __rs_deltree(struct gfs2_inode *ip, struct gfs2_blkreserv *rs)
rgd = rs->rs_rbm.rgd;
trace_gfs2_rs(ip, rs, TRACE_RS_TREEDEL);
rb_erase(&rs->rs_node, &rgd->rd_rstree);
- rb_init_node(&rs->rs_node);
+ RB_CLEAR_NODE(&rs->rs_node);
BUG_ON(!rgd->rd_rs_cnt);
rgd->rd_rs_cnt--;
OpenPOWER on IntegriCloud