diff --git a/[refs] b/[refs] index a7e1fffb9049..e71607f337a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec8acac84aea4245ae2cc999d56a68f0302cc847 +refs/heads/master: ac94bf582529343bb7f354d0eef6dc4e566bbbd5 diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c index 874a56a0801c..a4686326b5ae 100644 --- a/trunk/fs/nfsd/nfs4callback.c +++ b/trunk/fs/nfsd/nfs4callback.c @@ -761,8 +761,10 @@ static void _nfsd4_cb_recall(struct nfs4_delegation *dp) .rpc_cred = callback_cred }; - if (clnt == NULL) + if (clnt == NULL) { + nfs4_put_delegation(dp); return; /* Client is shutting down; give up. */ + } args->args_op = dp; msg.rpc_argp = args;