From: Benny Halevy Subject: Re: [PATCH 13/14] nfsd4: fix do_probe_callback errors Date: Thu, 12 Mar 2009 12:55:42 +0200 Message-ID: <49B8EA2E.4050707@panasas.com> References: <1236731222-3294-1-git-send-email-bfields@fieldses.org> <1236731222-3294-2-git-send-email-bfields@fieldses.org> <1236731222-3294-3-git-send-email-bfields@fieldses.org> <1236731222-3294-4-git-send-email-bfields@fieldses.org> <1236731222-3294-5-git-send-email-bfields@fieldses.org> <1236731222-3294-6-git-send-email-bfields@fieldses.org> <1236731222-3294-7-git-send-email-bfields@fieldses.org> <1236731222-3294-8-git-send-email-bfields@fieldses.org> <1236731222-3294-9-git-send-email-bfields@fieldses.org> <1236731222-3294-10-git-send-email-bfields@fieldses.org> <1236731222-3294-11-git-send-email-bfields@fieldses.org> <1236731222-3294-12-git-send-email-bfields@fieldses.org> <1236731222-3294-13-git-send-email-bfields@fieldses.org> <1236731222-3294-14-git-send-email-bfields@fieldses.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Cc: linux-nfs@vger.kernel.org, "J. Bruce Fields" To: "J. Bruce Fields" Return-path: Received: from gw-ca.panasas.com ([209.116.51.66]:30246 "EHLO laguna.int.panasas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755189AbZCLKzr (ORCPT ); Thu, 12 Mar 2009 06:55:47 -0400 In-Reply-To: <1236731222-3294-14-git-send-email-bfields@fieldses.org> Sender: linux-nfs-owner@vger.kernel.org List-ID: On Mar. 11, 2009, 2:27 +0200, "J. Bruce Fields" wrote: > From: J. Bruce Fields > > The errors returned aren't used. Just return 0 and make them available Wouldn't it be better to change the function to return void so justice would be seen to be done? A couple more comments below... > to a dprintk(). Also, consistently use -ERRNO errors instead of nfs > errors. > > Signed-off-by: J. Bruce Fields > --- > fs/nfsd/nfs4callback.c | 15 +++++++-------- > 1 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c > index 5dcd38e..c979af7 100644 > --- a/fs/nfsd/nfs4callback.c > +++ b/fs/nfsd/nfs4callback.c > @@ -389,12 +389,10 @@ static int do_probe_callback(void *data) > .rpc_argp = clp, > }; > struct rpc_clnt *client; > - int status; > + int status = -EINVAL; > > - if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5)) { > - status = nfserr_cb_path_down; > + if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5)) > goto out_err; > - } > > /* Initialize address */ > memset(&addr, 0, sizeof(addr)); > @@ -405,7 +403,8 @@ static int do_probe_callback(void *data) > /* Create RPC client */ > client = rpc_create(&args); > if (IS_ERR(client)) { > - dprintk("NFSD: couldn't create callback client\n"); > + dprintk("NFSD: couldn't create callback client: %d\n", > + PTR_ERR(client)); > status = PTR_ERR(client); How about reversing the order and dprintk status instead of PTR_ERR(client)? > goto out_err; > } > @@ -422,10 +421,10 @@ static int do_probe_callback(void *data) > out_release_client: > rpc_shutdown_client(client); > out_err: > - dprintk("NFSD: warning: no callback path to client %.*s\n", > - (int)clp->cl_name.len, clp->cl_name.data); > + dprintk("NFSD: warning: no callback path to client %.*: error %ds\n", seems like a typo. ": error %d" was pasted one char too soon... should be: + dprintk("NFSD: warning: no callback path to client %.*s: error %d\n", Benny > + (int)clp->cl_name.len, clp->cl_name.data, status); > put_nfs4_client(clp); > - return status; > + return 0; > } > > /*