Commit f3d43c76 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Trond Myklebust

NLM/lockd: remove b_done

We never actually set the b_done field any more; it's always zero.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
(cherry picked from af8412d4283ef91356e65e0ed9b025b376aebded commit)
parent e4e20512
...@@ -638,9 +638,6 @@ static void nlmsvc_grant_callback(struct rpc_task *task, void *data) ...@@ -638,9 +638,6 @@ static void nlmsvc_grant_callback(struct rpc_task *task, void *data)
if (task->tk_status < 0) { if (task->tk_status < 0) {
/* RPC error: Re-insert for retransmission */ /* RPC error: Re-insert for retransmission */
timeout = 10 * HZ; timeout = 10 * HZ;
} else if (block->b_done) {
/* Block already removed, kill it for real */
timeout = 0;
} else { } else {
/* Call was successful, now wait for client callback */ /* Call was successful, now wait for client callback */
timeout = 60 * HZ; timeout = 60 * HZ;
...@@ -709,12 +706,9 @@ nlmsvc_retry_blocked(void) ...@@ -709,12 +706,9 @@ nlmsvc_retry_blocked(void)
break; break;
if (time_after(block->b_when,jiffies)) if (time_after(block->b_when,jiffies))
break; break;
dprintk("nlmsvc_retry_blocked(%p, when=%ld, done=%d)\n", dprintk("nlmsvc_retry_blocked(%p, when=%ld)\n",
block, block->b_when, block->b_done); block, block->b_when);
kref_get(&block->b_count); 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); nlmsvc_release_block(block);
} }
......
...@@ -123,7 +123,6 @@ struct nlm_block { ...@@ -123,7 +123,6 @@ struct nlm_block {
unsigned int b_id; /* block id */ unsigned int b_id; /* block id */
unsigned char b_queued; /* re-queued */ unsigned char b_queued; /* re-queued */
unsigned char b_granted; /* VFS granted lock */ unsigned char b_granted; /* VFS granted lock */
unsigned char b_done; /* callback complete */
struct nlm_file * b_file; /* file in question */ struct nlm_file * b_file; /* file in question */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment