diff options
author | Michel Lespinasse <walken@google.com> | 2012-08-06 01:04:08 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-09-24 05:47:02 -0400 |
commit | 24d634e8f3b43fe2eb7c7d66567de7aba8edc308 (patch) | |
tree | f37a096d512b09237892a829b5f4e81e72516c09 /fs/gfs2 | |
parent | 3b1d0b9d0b6f4b76293c8f30cc95aa946bd34150 (diff) |
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')
-rw-r--r-- | fs/gfs2/rgrp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 06476b34a1b..7ce22d8c489 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
@@ -453,7 +453,7 @@ int gfs2_rs_alloc(struct gfs2_inode *ip) | |||
453 | if (!res) | 453 | if (!res) |
454 | error = -ENOMEM; | 454 | error = -ENOMEM; |
455 | 455 | ||
456 | rb_init_node(&res->rs_node); | 456 | RB_CLEAR_NODE(&res->rs_node); |
457 | 457 | ||
458 | down_write(&ip->i_rw_mutex); | 458 | down_write(&ip->i_rw_mutex); |
459 | if (ip->i_res) | 459 | if (ip->i_res) |
@@ -486,7 +486,7 @@ static void __rs_deltree(struct gfs2_inode *ip, struct gfs2_blkreserv *rs) | |||
486 | rgd = rs->rs_rbm.rgd; | 486 | rgd = rs->rs_rbm.rgd; |
487 | trace_gfs2_rs(ip, rs, TRACE_RS_TREEDEL); | 487 | trace_gfs2_rs(ip, rs, TRACE_RS_TREEDEL); |
488 | rb_erase(&rs->rs_node, &rgd->rd_rstree); | 488 | rb_erase(&rs->rs_node, &rgd->rd_rstree); |
489 | rb_init_node(&rs->rs_node); | 489 | RB_CLEAR_NODE(&rs->rs_node); |
490 | BUG_ON(!rgd->rd_rs_cnt); | 490 | BUG_ON(!rgd->rd_rs_cnt); |
491 | rgd->rd_rs_cnt--; | 491 | rgd->rd_rs_cnt--; |
492 | 492 | ||