Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NLM/lockd: remove b_done

Browse source 
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)
This commit is contained in:
J. Bruce Fields 2006-08-03 15:07:47 -04:00 committed by Trond Myklebust
parent e4e20512cf
commit f3d43c769d
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/lockd/svclock.c
View file

@ -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,13 +706,10 @@ 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_grant_blocked(block);
nlmsvc_unlink_block(block);
else
nlmsvc_grant_blocked(block);
nlmsvc_release_block(block); nlmsvc_release_block(block);
} }

1
include/linux/lockd/lockd.h
View file

@ -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 */
}; };