From: Dan Carpenter Date: Fri, 4 Jan 2019 06:47:03 +0000 (+0300) Subject: nfsd: fix an IS_ERR() vs NULL check X-Git-Tag: v5.1-rc1~44^2~11 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1c3da4452d185e4be663e76a1b9842184d8f9c4c;p=linux-block.git nfsd: fix an IS_ERR() vs NULL check The get_backchannel_cred() used to return error pointers on error but now it returns NULL pointers. Fixes: 97f68c6b02e0 ("SUNRPC: add 'struct cred *' to auth_cred and rpc_cre") Signed-off-by: Dan Carpenter Signed-off-by: J. Bruce Fields --- diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index c74e4538d0eb..9b38dab1c21b 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -913,9 +913,9 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c return PTR_ERR(client); } cred = get_backchannel_cred(clp, client, ses); - if (IS_ERR(cred)) { + if (!cred) { rpc_shutdown_client(client); - return PTR_ERR(cred); + return -ENOMEM; } clp->cl_cb_client = client; clp->cl_cb_cred = cred;