From 9cab0b360f26c9fc1fd70907d1c25ccb8bbc418b Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Sun, 21 Feb 2010 17:53:04 -0800 Subject: [PATCH] --- yaml --- r: 192359 b: refs/heads/master c: 9045b4b9f7f340f43de0cf687b5b52f6feaaa984 h: refs/heads/master i: 192357: ed82f9b81409bf2b7b72cd89950ef213846fbdd1 192355: 17af6a49f2f06def07216cca58d4219dd8d82dd7 192351: d85f424d81e3fc40765e530259bba2cfb0457b3c v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4callback.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c43d49427f54..e389dcf0ae99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3df796dbe97a98a6a25e6b7b88e9d326e261f371 +refs/heads/master: 9045b4b9f7f340f43de0cf687b5b52f6feaaa984 diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c index b99c3f0f1d35..91eb2ea9ef0a 100644 --- a/trunk/fs/nfsd/nfs4callback.c +++ b/trunk/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); }