From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755668Ab2HFJsU (ORCPT ); Mon, 6 Aug 2012 05:48:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39035 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754970Ab2HFJsT (ORCPT ); Mon, 6 Aug 2012 05:48:19 -0400 Subject: Re: linux-next: build failure after merge of the akpm tree From: Steven Whitehouse To: Michel Lespinasse Cc: Stephen Rothwell , Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20120806050408.GA12131@google.com> References: <20120806134318.8af35d047e255fd25398210b@canb.auug.org.au> <20120806050408.GA12131@google.com> Content-Type: text/plain; charset="UTF-8" Organization: Red Hat UK Ltd Date: Mon, 06 Aug 2012 10:46:36 +0100 Message-ID: <1344246396.2722.7.camel@menhir> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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--; >