diff options
| author | Anton Blanchard <anton@samba.org> | 2003-08-27 01:44:05 +1000 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2003-08-27 01:44:05 +1000 |
| commit | 64553593bc1bb5803f121c2cedece686f5804730 (patch) | |
| tree | 13ec1c4f3b67a77ebca5676b4bab7c9ec30d79e8 /include/linux | |
| parent | afb753ea258c299f0f4615917bd6f7d65fcaeca5 (diff) | |
| parent | 6cf7367489c7b055b6e02519de29d48c9ef238bb (diff) | |
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/tmp3
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sunrpc/timer.h | 16 | ||||
| -rw-r--r-- | include/linux/sunrpc/xprt.h | 6 |
2 files changed, 5 insertions, 17 deletions
diff --git a/include/linux/sunrpc/timer.h b/include/linux/sunrpc/timer.h index ff6bc599eeec..f2f2ffc4f2cd 100644 --- a/include/linux/sunrpc/timer.h +++ b/include/linux/sunrpc/timer.h @@ -15,7 +15,6 @@ struct rpc_rtt { unsigned long timeo; /* default timeout value */ unsigned long srtt[5]; /* smoothed round trip time << 3 */ unsigned long sdrtt[5]; /* smoothed medium deviation of RTT */ - atomic_t ntimeouts; /* Global count of the number of timeouts */ }; @@ -23,19 +22,4 @@ extern void rpc_init_rtt(struct rpc_rtt *rt, unsigned long timeo); extern void rpc_update_rtt(struct rpc_rtt *rt, unsigned timer, long m); extern unsigned long rpc_calc_rto(struct rpc_rtt *rt, unsigned timer); -static inline void rpc_inc_timeo(struct rpc_rtt *rt) -{ - atomic_inc(&rt->ntimeouts); -} - -static inline void rpc_clear_timeo(struct rpc_rtt *rt) -{ - atomic_set(&rt->ntimeouts, 0); -} - -static inline int rpc_ntimeo(struct rpc_rtt *rt) -{ - return atomic_read(&rt->ntimeouts); -} - #endif /* _LINUX_SUNRPC_TIMER_H */ diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h index b360e54f894a..e29381edeaea 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h @@ -98,6 +98,10 @@ struct rpc_rqst { struct list_head rq_list; + struct xdr_buf rq_private_buf; /* The receive buffer + * used in the softirq. + */ + /* * For authentication (e.g. auth_des) */ @@ -111,7 +115,7 @@ struct rpc_rqst { unsigned long rq_xtime; /* when transmitted */ int rq_ntimeo; - int rq_nresend; + int rq_ntrans; }; #define rq_svec rq_snd_buf.head #define rq_slen rq_snd_buf.len |