lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfsd4: fix do_probe_callback errors

Browse Source 
The errors returned aren't used.  Just return 0 and make them available
to a dprintk().  Also, consistently use -ERRNO errors instead of nfs
errors.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Reviewed-by: Benny Halevy <bhalevy@panasas.com>
This commit is contained in:
J. Bruce Fields
2009-02-22 15:52:13 -08:00
parent 8b671b8070
commit 418cd20aa1
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fs/nfsd/nfs4callback.c
View File

@@ -389,12 +389,10 @@ static int do_probe_callback(void *data)
.rpc_argp = clp, .rpc_argp = clp,
}; };
struct rpc_clnt *client; struct rpc_clnt *client;
int status; int status = -EINVAL;
if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5)) { if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5))
status = nfserr_cb_path_down;
goto out_err; goto out_err;
}
/* Initialize address */ /* Initialize address */
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
@@ -405,8 +403,9 @@ static int do_probe_callback(void *data)
/* Create RPC client */ /* Create RPC client */
client = rpc_create(&args); client = rpc_create(&args);
if (IS_ERR(client)) { if (IS_ERR(client)) {
dprintk("NFSD: couldn't create callback client\n");
status = PTR_ERR(client); status = PTR_ERR(client);
dprintk("NFSD: couldn't create callback client: %d\n",
status);
goto out_err; goto out_err;
} }
@@ -422,10 +421,10 @@ static int do_probe_callback(void *data)
out_release_client: out_release_client:
rpc_shutdown_client(client); rpc_shutdown_client(client);
out_err: out_err:
dprintk("NFSD: warning: no callback path to client %.*s\n", dprintk("NFSD: warning: no callback path to client %.*s: error %d\n",
(int)clp->cl_name.len, clp->cl_name.data); (int)clp->cl_name.len, clp->cl_name.data, status);
put_nfs4_client(clp); put_nfs4_client(clp);
return status; return 0;
} }
/* /*