diff options
| author | Trond Myklebust <trond.myklebust@fys.uio.no> | 2002-08-14 21:29:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-14 21:29:56 -0700 |
| commit | fb9100d0a6a949aaaeaa1957021207ac6600b5ce (patch) | |
| tree | ba42d6b03e01dae3cc0dfd6efc4ca26e1b30c4cd /include/linux | |
| parent | 7a72fa16caa846de58eed7f3532cf7d634023173 (diff) | |
[PATCH] Clean up the RPC socket slot allocation code [2/2]
Patch by Chuck Lever. Remove the timeout logic from call_reserve.
This improves the overall RPC call ordering, and ensures that soft
tasks don't time out and give up before they have attempted to send
their message down the socket.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sunrpc/xprt.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h index c9b93c6a7a27..2ce2c8223384 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h @@ -57,8 +57,7 @@ struct rpc_timeout { unsigned long to_current, /* current timeout */ to_initval, /* initial timeout */ to_maxval, /* max timeout */ - to_increment, /* if !exponential */ - to_resrvval; /* reserve timeout */ + to_increment; /* if !exponential */ short to_retries; /* max # of retries */ unsigned char to_exponential; }; @@ -173,7 +172,7 @@ void xprt_default_timeout(struct rpc_timeout *, int); void xprt_set_timeout(struct rpc_timeout *, unsigned int, unsigned long); -int xprt_reserve(struct rpc_task *); +void xprt_reserve(struct rpc_task *); void xprt_transmit(struct rpc_task *); void xprt_receive(struct rpc_task *); int xprt_adjust_timeout(struct rpc_timeout *); |