summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4callback.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-03-04 17:32:59 +0100
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-04-22 17:34:02 +0200
commitb12a05cbdfdf7e4d8cbe8fa78e995f971420086b (patch)
tree05f82bd2abf8ab0b688383c467b76db713cdcc09 /fs/nfsd/nfs4callback.c
parentnfsd4: don't sleep in lease-break callback (diff)
downloadlinux-b12a05cbdfdf7e4d8cbe8fa78e995f971420086b.tar.xz
linux-b12a05cbdfdf7e4d8cbe8fa78e995f971420086b.zip
nfsd4: cl_count is unused
Now that the shutdown sequence guarantees callbacks are shut down before the client is destroyed, we no longer have a use for cl_count. We'll probably reinstate a reference count on the client some day, but it will be held by users other than callbacks. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
-rw-r--r--fs/nfsd/nfs4callback.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index e078c747f49d..5856fc8adb70 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -681,10 +681,8 @@ static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata)
static void nfsd4_cb_recall_release(void *calldata)
{
struct nfs4_delegation *dp = calldata;
- struct nfs4_client *clp = dp->dl_client;
nfs4_put_delegation(dp);
- put_nfs4_client(clp);
}
static const struct rpc_call_ops nfsd4_cb_recall_ops = {
@@ -746,10 +744,8 @@ static void _nfsd4_cb_recall(struct nfs4_delegation *dp)
dp->dl_retries = 1;
status = rpc_call_async(clnt, &msg, RPC_TASK_SOFT,
&nfsd4_cb_recall_ops, dp);
- if (status) {
- put_nfs4_client(clp);
+ if (status)
nfs4_put_delegation(dp);
- }
}
void nfsd4_do_callback_rpc(struct work_struct *w)