From fdf5c3bf81b8744b1061276b9c075e5a38054c3f Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@citi.umich.edu>
Date: Tue, 1 Jun 2010 11:21:40 -0400
Subject: [PATCH] --- yaml --- r: 206431 b: refs/heads/master c:
 cba9ba4b902270c22f8b9c5149a284216b633fc1 h: refs/heads/master i:   206429:
 44c9e0311be047ef42cc9cba33958591e8eb271e   206427:
 8b2414baff7d628b3530dfd14b0b71d84f361e18   206423:
 fdae4a7d61aaa075893e46cf122461864eefacfa   206415:
 77586e7c894ef1e063462edb4aed8449f1b29d7a   206399:
 38c7e9fc7f2674c9e8c6693938eb538dddcd4afb v: v3

---
 [refs]                       | 2 +-
 trunk/fs/nfsd/nfs4callback.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e71607f337a1..f4328c6d1711 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac94bf582529343bb7f354d0eef6dc4e566bbbd5
+refs/heads/master: cba9ba4b902270c22f8b9c5149a284216b633fc1
diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c
index a4686326b5ae..1e6497ed3e12 100644
--- a/trunk/fs/nfsd/nfs4callback.c
+++ b/trunk/fs/nfsd/nfs4callback.c
@@ -689,6 +689,7 @@ static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata)
 		warn_no_callback_path(clp, task->tk_status);
 		if (current_rpc_client != task->tk_client) {
 			/* queue a callback on the new connection: */
+			atomic_inc(&dp->dl_count);
 			nfsd4_cb_recall(dp);
 			return;
 		}