diff --git a/[refs] b/[refs] index 1cd42dc0d2ff..de74a0a310f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18f82731b7784ba81ee9b1ed6a8179b577fa898b +refs/heads/master: d7fdcfe0aaaf6dffca6fa857bab374182fe7ca8b diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c index 3ddc9fb2e358..3fd7136321ca 100644 --- a/trunk/fs/nfsd/nfs4callback.c +++ b/trunk/fs/nfsd/nfs4callback.c @@ -490,8 +490,8 @@ nfsd4_cb_recall(struct nfs4_delegation *dp) * Success or failure, now we're either waiting for lease expiration * or deleg_return. */ - nfs4_lock_state(); put_nfs4_client(clp); + nfs4_lock_state(); nfs4_put_delegation(dp); nfs4_unlock_state(); return;