From 9bf53c085781789dda71995918966589a51ba97c Mon Sep 17 00:00:00 2001
From: Michel Lespinasse <walken@google.com>
Date: Sun, 5 Aug 2012 22:04:08 -0700
Subject: [PATCH] --- yaml --- r: 323268 b: refs/heads/master c:
 24d634e8f3b43fe2eb7c7d66567de7aba8edc308 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/gfs2/rgrp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2abdfd3e0a0c..7bb448c966a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b1d0b9d0b6f4b76293c8f30cc95aa946bd34150
+refs/heads/master: 24d634e8f3b43fe2eb7c7d66567de7aba8edc308
diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index 06476b34a1b9..7ce22d8c489b 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/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--;