diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2006-08-03 15:07:47 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-08-03 16:56:02 -0400 |
| commit | f3d43c769d14b7065da7f62ec468b1fcb8cd6e06 (patch) | |
| tree | bcecb5319c7395bec95a0ebbb730b3c293d7cceb | |
| parent | e4e20512cfe0bacec0764b4925889d1fa94644f9 (diff) | |
| download | op-kernel-dev-f3d43c769d14b7065da7f62ec468b1fcb8cd6e06.zip op-kernel-dev-f3d43c769d14b7065da7f62ec468b1fcb8cd6e06.tar.gz | |
NLM/lockd: remove b_done
We never actually set the b_done field any more; it's always zero.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
(cherry picked from af8412d4283ef91356e65e0ed9b025b376aebded commit)
| -rw-r--r-- | fs/lockd/svclock.c | 12 | ||||
| -rw-r--r-- | include/linux/lockd/lockd.h | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index baf5ae5..c9d4197 100644 --- a/fs/lockd/svclock.c +++ b/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/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index aa4fe90..0d92c46 100644 --- a/include/linux/lockd/lockd.h +++ b/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 */ }; |
