From 436aff8fbdd4ba797403a75e4f2b00297657a4d2 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@fieldses.org>
Date: Thu, 3 Aug 2006 15:07:47 -0400
Subject: [PATCH] --- yaml --- r: 33171 b: refs/heads/master c:
 f3d43c769d14b7065da7f62ec468b1fcb8cd6e06 h: refs/heads/master i:   33169:
 8272f2491326d628dfb83987160bfc8fd232073c   33167:
 c14a2cf7cacab5a63a6b4092839ca96441eb0a31 v: v3

---
 [refs]                            |  2 +-
 trunk/fs/lockd/svclock.c          | 12 +++---------
 trunk/include/linux/lockd/lockd.h |  1 -
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index f948be026f82..d4dec85196af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4e20512cfe0bacec0764b4925889d1fa94644f9
+refs/heads/master: f3d43c769d14b7065da7f62ec468b1fcb8cd6e06
diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c
index baf5ae513481..c9d419703cf3 100644
--- a/trunk/fs/lockd/svclock.c
+++ b/trunk/fs/lockd/svclock.c
@@ -638,9 +638,6 @@ static void nlmsvc_grant_callback(struct rpc_task *task, void *data)
 	if (task->tk_status < 0) {
 		/* RPC error: Re-insert for retransmission */
 		timeout = 10 * HZ;
-	} else if (block->b_done) {
-		/* Block already removed, kill it for real */
-		timeout = 0;
 	} else {
 		/* Call was successful, now wait for client callback */
 		timeout = 60 * HZ;
@@ -709,13 +706,10 @@ nlmsvc_retry_blocked(void)
 			break;
 	        if (time_after(block->b_when,jiffies))
 			break;
-		dprintk("nlmsvc_retry_blocked(%p, when=%ld, done=%d)\n",
-			block, block->b_when, block->b_done);
+		dprintk("nlmsvc_retry_blocked(%p, when=%ld)\n",
+			block, block->b_when);
 		kref_get(&block->b_count);
-		if (block->b_done)
-			nlmsvc_unlink_block(block);
-		else
-			nlmsvc_grant_blocked(block);
+		nlmsvc_grant_blocked(block);
 		nlmsvc_release_block(block);
 	}
 
diff --git a/trunk/include/linux/lockd/lockd.h b/trunk/include/linux/lockd/lockd.h
index aa4fe905bb4d..0d92c468d55a 100644
--- a/trunk/include/linux/lockd/lockd.h
+++ b/trunk/include/linux/lockd/lockd.h
@@ -123,7 +123,6 @@ struct nlm_block {
 	unsigned int		b_id;		/* block id */
 	unsigned char		b_queued;	/* re-queued */
 	unsigned char		b_granted;	/* VFS granted lock */
-	unsigned char		b_done;		/* callback complete */
 	struct nlm_file *	b_file;		/* file in question */
 };