Hi, Thanks for the patch - I'd not realised that I'd used the wrong function there... it is fixed now in the GFS2 -nmw tree, Steve. On Sun, 2012-08-05 at 22:04 -0700, Michel Lespinasse wrote: > 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@xxxxxxxxxx> > --- > fs/gfs2/rgrp.c | 5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c > index eaa4188..675e7cc 100644 > --- a/fs/gfs2/rgrp.c > +++ b/fs/gfs2/rgrp.c > @@ -487,7 +487,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) > @@ -520,7 +520,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--; > -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
