diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /include/linux/sunrpc | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'include/linux/sunrpc')
| -rw-r--r-- | include/linux/sunrpc/sched.h | 1 | ||||
| -rw-r--r-- | include/linux/sunrpc/svc.h | 1 | ||||
| -rw-r--r-- | include/linux/sunrpc/xdr.h | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h index 279636434..a45f0ae2e 100644 --- a/include/linux/sunrpc/sched.h +++ b/include/linux/sunrpc/sched.h @@ -63,6 +63,7 @@ struct rpc_task { void (*tk_callback)(struct rpc_task *); void (*tk_action)(struct rpc_task *); void (*tk_exit)(struct rpc_task *); + void (*tk_release)(struct rpc_task *); void * tk_calldata; /* diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 1e17e52bb..fb33c6b5f 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -10,6 +10,7 @@ #ifndef SUNRPC_SVC_H #define SUNRPC_SVC_H +#include <linux/in.h> #include <linux/sunrpc/types.h> #include <linux/sunrpc/xdr.h> #include <linux/sunrpc/svcauth.h> diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h index 5a29918e6..98bf0ec20 100644 --- a/include/linux/sunrpc/xdr.h +++ b/include/linux/sunrpc/xdr.h @@ -59,6 +59,7 @@ void xdr_init(void); /* * Miscellaneous XDR helper functions */ +u32 * xdr_encode_array(u32 *p, const char *s, unsigned int len); u32 * xdr_encode_string(u32 *p, const char *s); u32 * xdr_decode_string(u32 *p, char **sp, int *lenp, int maxlen); u32 * xdr_encode_netobj(u32 *p, const struct xdr_netobj *); @@ -93,6 +94,9 @@ xdr_adjust_iovec(struct iovec *iov, u32 *p) return iov->iov_len = ((u8 *) p - (u8 *) iov->iov_base); } +void xdr_shift_iovec(struct iovec *, int, size_t); +void xdr_zero_iovec(struct iovec *, int, size_t); + #endif /* __KERNEL__ */ #endif /* _SUNRPC_XDR_H_ */ |