Merge tag 'nfsd-5.1' of git://linux-nfs.org/~bfields/linux

[linux-2.6-block.git] / fs / nfsd / nfs4callback.c

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index a9d24d5a967c0b5ff2fdb333dae4ab28a610027c..d219159b98afc54bda6d2efee824b41487db17c0 100644 (file)
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -900,9 +900,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;