Return-Path: linux-nfs-owner@vger.kernel.org Received: from fieldses.org ([174.143.236.118]:38767 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753961AbaAIQem (ORCPT ); Thu, 9 Jan 2014 11:34:42 -0500 Date: Thu, 9 Jan 2014 11:34:41 -0500 From: Dr Fields James Bruce To: Kinglong Mee Cc: Trond Myklebust , Linux NFS Mailing List Subject: Re: [PATCH] SUNRPC: Clear xpt_bc_xprt if xs_setup_bc_tcp failed Message-ID: <20140109163441.GC14308@fieldses.org> References: <52CB8564.6040002@gmail.com> <11FBA3CF-C026-42F8-943E-326B11A55929@primarydata.com> <52CBAC0C.9000309@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 In-Reply-To: <52CBAC0C.9000309@gmail.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: On Tue, Jan 07, 2014 at 03:26:04PM +0800, Kinglong Mee wrote: > On 01/07/2014 01:01 PM, Trond Myklebust wrote: > > > > On Jan 6, 2014, at 23:41, Kinglong Mee wrote: > > > >> If try_module_get failed, xpt_bc_xprt should be set to NULL, > >> because xprt will be free. > >> > >> Don't needed using xprt_put to free xprt, because it is always new. > >> > >> Signed-off-by: Kinglong Mee > >> --- > >> net/sunrpc/xprtsock.c | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c > >> index 4fcdf74..5ed124f 100644 > >> --- a/net/sunrpc/xprtsock.c > >> +++ b/net/sunrpc/xprtsock.c > >> @@ -2986,10 +2986,10 @@ static struct rpc_xprt *xs_setup_bc_tcp(struct xprt_create *args) > >> */ > >> xprt_set_connected(xprt); > >> > >> - > >> if (try_module_get(THIS_MODULE)) > >> return xprt; > >> - xprt_put(xprt); > >> + > >> + args->bc_xprt->xpt_bc_xprt = NULL; > >> ret = ERR_PTR(-EINVAL); > >> out_err: > >> xs_xprt_free(xprt); > > > > Just move the 'args->bc_xprt->xpt_bc_xprt = xprt’ line into the caller (see earlier discussion about xs_setup_bc_tcp()). Quite frankly, I don’t see why the client code should be modifying this variable in the first place. An svc_xprt is a server construct. > > Hi Bruce, > > When reviewing those codes for bc_xprt, I found commit d75faea330dbd1873c9094e9926ae306590c0998 > 'rpc: move sk_bc_xprt to svc_xprt'. I'd like recording bc_xprt in svc_sock. OK, I think it would be alright to revert that commit. --b.