diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 11:32:59 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-04-22 11:34:02 -0400 |
commit | b12a05cbdfdf7e4d8cbe8fa78e995f971420086b (patch) | |
tree | 05f82bd2abf8ab0b688383c467b76db713cdcc09 /fs/nfsd/nfs4callback.c | |
parent | b5a1a81e5c25fb6bb3fdc1812ba69ff6ab638fcf (diff) |
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.c | 6 |
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) | |||
681 | static void nfsd4_cb_recall_release(void *calldata) | 681 | static void nfsd4_cb_recall_release(void *calldata) |
682 | { | 682 | { |
683 | struct nfs4_delegation *dp = calldata; | 683 | struct nfs4_delegation *dp = calldata; |
684 | struct nfs4_client *clp = dp->dl_client; | ||
685 | 684 | ||
686 | nfs4_put_delegation(dp); | 685 | nfs4_put_delegation(dp); |
687 | put_nfs4_client(clp); | ||
688 | } | 686 | } |
689 | 687 | ||
690 | static const struct rpc_call_ops nfsd4_cb_recall_ops = { | 688 | static const struct rpc_call_ops nfsd4_cb_recall_ops = { |
@@ -746,10 +744,8 @@ static void _nfsd4_cb_recall(struct nfs4_delegation *dp) | |||
746 | dp->dl_retries = 1; | 744 | dp->dl_retries = 1; |
747 | status = rpc_call_async(clnt, &msg, RPC_TASK_SOFT, | 745 | status = rpc_call_async(clnt, &msg, RPC_TASK_SOFT, |
748 | &nfsd4_cb_recall_ops, dp); | 746 | &nfsd4_cb_recall_ops, dp); |
749 | if (status) { | 747 | if (status) |
750 | put_nfs4_client(clp); | ||
751 | nfs4_put_delegation(dp); | 748 | nfs4_put_delegation(dp); |
752 | } | ||
753 | } | 749 | } |
754 | 750 | ||
755 | void nfsd4_do_callback_rpc(struct work_struct *w) | 751 | void nfsd4_do_callback_rpc(struct work_struct *w) |