aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-02-21 17:53:04 -0800
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-04-02 17:04:32 -0400
commit9045b4b9f7f340f43de0cf687b5b52f6feaaa984 (patch)
tree5f955b3544bb8051723646090c2f2ecc91b07225 /fs/nfsd
parent3df796dbe97a98a6a25e6b7b88e9d326e261f371 (diff)
downloadkernel_samsung_smdk4412-9045b4b9f7f340f43de0cf687b5b52f6feaaa984.zip
kernel_samsung_smdk4412-9045b4b9f7f340f43de0cf687b5b52f6feaaa984.tar.gz
kernel_samsung_smdk4412-9045b4b9f7f340f43de0cf687b5b52f6feaaa984.tar.bz2
nfsd4: remove probe task's reference on client
Any null probe rpc will be synchronously destroyed by the rpc_shutdown_client() in expire_client(), so the rpc task cannot outlast the nfs4 client. Therefore there's no need for that task to hold a reference on the client. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4callback.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index b99c3f0..91eb2ea 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -509,7 +509,6 @@ static void nfsd4_cb_probe_done(struct rpc_task *task, void *calldata)
warn_no_callback_path(clp, task->tk_status);
else
atomic_set(&clp->cl_cb_conn.cb_set, 1);
- put_nfs4_client(clp);
}
static const struct rpc_call_ops nfsd4_cb_probe_ops = {
@@ -542,10 +541,8 @@ void do_probe_callback(struct nfs4_client *clp)
status = rpc_call_async(cb->cb_client, &msg,
RPC_TASK_SOFT | RPC_TASK_SOFTCONN,
&nfsd4_cb_probe_ops, (void *)clp);
- if (status) {
+ if (status)
warn_no_callback_path(clp, status);
- put_nfs4_client(clp);
- }
}
/*
@@ -563,10 +560,6 @@ nfsd4_probe_callback(struct nfs4_client *clp)
warn_no_callback_path(clp, status);
return;
}
-
- /* the task holds a reference to the nfs4_client struct */
- atomic_inc(&clp->cl_count);
-
do_probe_callback(clp);
}