summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2011-05-31 15:15:34 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-06-15 11:24:27 -0400
commit0b760113a3a155269a3fba93a409c640031dd68f (patch)
tree699dc3e0ebe2df11b0c67045c046deafdb56282d /include
parent9e3bd4e24e94d60d2e0762e919aab6c9a7fc0c5b (diff)
downloadlinux-stable-0b760113a3a155269a3fba93a409c640031dd68f.tar.gz
linux-stable-0b760113a3a155269a3fba93a409c640031dd68f.tar.bz2
linux-stable-0b760113a3a155269a3fba93a409c640031dd68f.zip
NLM: Don't hang forever on NLM unlock requests
If the NLM daemon is killed on the NFS server, we can currently end up hanging forever on an 'unlock' request, instead of aborting. Basically, if the rpcbind request fails, or the server keeps returning garbage, we really want to quit instead of retrying. Tested-by: Vasily Averin <vvs@sw.ru> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: stable@kernel.org
Diffstat (limited to 'include')
-rw-r--r--include/linux/sunrpc/sched.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index f73c482ec9c6..fe2d8e6b923b 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -84,7 +84,8 @@ struct rpc_task {
#endif
unsigned char tk_priority : 2,/* Task priority */
tk_garb_retry : 2,
- tk_cred_retry : 2;
+ tk_cred_retry : 2,
+ tk_rebind_retry : 2;
};
#define tk_xprt tk_client->cl_xprt