git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
lockd
/
svclock.c
diff --git
a/fs/lockd/svclock.c
b/fs/lockd/svclock.c
index
3ef7391
..
c9d4197
100644
(file)
--- a/
fs/lockd/svclock.c
+++ b/
fs/lockd/svclock.c
@@
-20,7
+20,6
@@
* Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
*/
* Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
@@
-639,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;
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;
} else {
/* Call was successful, now wait for client callback */
timeout = 60 * HZ;
@@
-710,13
+706,10
@@
nlmsvc_retry_blocked(void)
break;
if (time_after(block->b_when,jiffies))
break;
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);
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);
}