[PATCH] remove unused RPC cruft

smaller patch that removes unused RPC cruft.

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 1d9d01cf7494f4f227114013c6ef1ea481c3d116..17a46b575ba0f8d300d115c66f1c26e10d710b74 100644 (file)
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -50,7 +50,6 @@ struct rpc_clnt {
                                cl_droppriv : 1,/* enable NFS suid hack */
                                cl_oneshot  : 1,/* dispose after use */
                                cl_dead     : 1;/* abandoned */
-       unsigned long           cl_hardmax;     /* max hard timeout */
 
        struct rpc_rtt          cl_rtt;         /* RTO estimator data */
 
@@ -135,13 +134,6 @@ int rpc_call(struct rpc_clnt *clnt, u32 proc, void *argp, void *resp, int flags)
        return rpc_call_sync(clnt, &msg, flags);
 }
                
-
-static __inline__ void
-rpc_set_timeout(struct rpc_clnt *clnt, unsigned int retr, unsigned long incr)
-{
-       xprt_set_timeout(&clnt->cl_timeout, retr, incr);
-}
-
 extern void rpciod_wake_up(void);
 
 /*

diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 601899c6ed875bc74ca6781b4482ce4b304e1167..16579738fa40e65ace1ba73feb50dc2fb71c7de2 100644 (file)
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -13,12 +13,6 @@
 #include <linux/sunrpc/types.h>
 #include <linux/wait.h>
 
-/*
- * Define this if you want to test the fast scheduler for async calls.
- * This is still experimental and may not work.
- */
-#undef  CONFIG_RPC_FASTSCHED
-
 /*
  * This is the actual RPC procedure call info.
  */

diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 3875f87e938bfd40410b11f1386623ca89be9b2d..0233988f40b459e1efa9310392dde96606b7f630 100644 (file)
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -127,7 +127,6 @@ xdr_adjust_iovec(struct iovec *iov, u32 *p)
 }
 
 void xdr_shift_iovec(struct iovec *, int, size_t);
-void xdr_zero_iovec(struct iovec *, int, size_t);
 
 /*
  * Maximum number of iov's we use.
@@ -156,12 +155,6 @@ typedef size_t (*skb_read_actor_t)(skb_reader_t *desc, void *to, size_t len);
 extern void xdr_partial_copy_from_skb(struct xdr_buf *, unsigned int,
                skb_reader_t *, skb_read_actor_t);
 
-extern int xdr_copy_skb(struct xdr_buf *xdr, unsigned int base,
-               struct sk_buff *skb, unsigned int offset);
-
-extern int xdr_copy_and_csum_skb(struct xdr_buf *xdr, unsigned int base,
-               struct sk_buff *skb, unsigned int offset, unsigned int csum);
-
 #endif /* __KERNEL__ */
 
 #endif /* _SUNRPC_XDR_H_ */