5 files changed, 48 insertions, 25 deletions

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index ab151bbb66df..f147e6b84332 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -49,7 +49,6 @@ struct rpc_clnt {
 
         unsigned int            cl_softrtry : 1,/* soft timeouts */
                                 cl_intr     : 1,/* interruptible */
-                                cl_chatty   : 1,/* be verbose */
                                 cl_autobind : 1,/* use getport() */
                                 cl_oneshot  : 1,/* dispose after use */
                                 cl_dead     : 1;/* abandoned */
@@ -126,7 +125,8 @@ int		rpc_register(u32, u32, int, unsigned short, int *);
 void            rpc_call_setup(struct rpc_task *, struct rpc_message *, int);
 
 int             rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg,
-                               int flags, rpc_action callback, void *clntdata);
+                               int flags, const struct rpc_call_ops *tk_ops,
+                               void *calldata);
 int             rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg,
                               int flags);
 void            rpc_restart_call(struct rpc_task *);
@@ -134,6 +134,7 @@ void		rpc_clnt_sigmask(struct rpc_clnt *clnt, sigset_t *oldset);
 void            rpc_clnt_sigunmask(struct rpc_clnt *clnt, sigset_t *oldset);
 void            rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int);
 size_t          rpc_max_payload(struct rpc_clnt *);
+void            rpc_force_rebind(struct rpc_clnt *);
 int             rpc_ping(struct rpc_clnt *clnt, int flags);
 
 static __inline__
diff --git a/include/linux/sunrpc/gss_spkm3.h b/include/linux/sunrpc/gss_spkm3.h
index 0beb2cf00a84..336e218c2782 100644
--- a/include/linux/sunrpc/gss_spkm3.h
+++ b/include/linux/sunrpc/gss_spkm3.h
@@ -48,7 +48,7 @@ u32 spkm3_read_token(struct spkm3_ctx *ctx, struct xdr_netobj *read_token, struc
 #define CKSUMTYPE_RSA_MD5            0x0007
 
 s32 make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
-                   struct xdr_netobj *cksum);
+                   int body_offset, struct xdr_netobj *cksum);
 void asn1_bitstring_len(struct xdr_netobj *in, int *enclen, int *zerobits);
 int decode_asn1_bitstring(struct xdr_netobj *out, char *in, int enclen, 
                    int explen);
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 4d77e90d0b30..8b25629accd8 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -27,6 +27,7 @@ struct rpc_message {
         struct rpc_cred *       rpc_cred;       /* Credentials */
 };
 
+struct rpc_call_ops;
 struct rpc_wait_queue;
 struct rpc_wait {
         struct list_head        list;           /* wait queue links */
@@ -41,6 +42,7 @@ struct rpc_task {
 #ifdef RPC_DEBUG
         unsigned long           tk_magic;       /* 0xf00baa */
 #endif
+        atomic_t                tk_count;       /* Reference count */
         struct list_head        tk_task;        /* global list of tasks */
         struct rpc_clnt *       tk_client;      /* RPC client */
         struct rpc_rqst *       tk_rqstp;       /* RPC request */
@@ -50,8 +52,6 @@ struct rpc_task {
          * RPC call state
          */
         struct rpc_message      tk_msg;         /* RPC call info */
-        __u32 *                 tk_buffer;      /* XDR buffer */
-        size_t                  tk_bufsize;
         __u8                    tk_garb_retry;
         __u8                    tk_cred_retry;
 
@@ -61,13 +61,12 @@ struct rpc_task {
          * timeout_fn   to be executed by timer bottom half
          * callback     to be executed after waking up
          * action       next procedure for async tasks
-         * exit         exit async task and report to caller
+         * tk_ops       caller callbacks
          */
         void                    (*tk_timeout_fn)(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 *);
+        const struct rpc_call_ops *tk_ops;
         void *                  tk_calldata;
 
         /*
@@ -78,7 +77,6 @@ struct rpc_task {
         struct timer_list       tk_timer;       /* kernel timer */
         unsigned long           tk_timeout;     /* timeout for rpc_sleep() */
         unsigned short          tk_flags;       /* misc flags */
-        unsigned char           tk_active   : 1;/* Task has been activated */
         unsigned char           tk_priority : 2;/* Task priority */
         unsigned long           tk_runstate;    /* Task run status */
         struct workqueue_struct *tk_workqueue;  /* Normally rpciod, but could
@@ -111,6 +109,13 @@ struct rpc_task {
 
 typedef void                    (*rpc_action)(struct rpc_task *);
 
+struct rpc_call_ops {
+        void (*rpc_call_prepare)(struct rpc_task *, void *);
+        void (*rpc_call_done)(struct rpc_task *, void *);
+        void (*rpc_release)(void *);
+};
+
+
 /*
  * RPC task flags
  */
@@ -129,7 +134,6 @@ typedef void			(*rpc_action)(struct rpc_task *);
 #define RPC_IS_SWAPPER(t)       ((t)->tk_flags & RPC_TASK_SWAPPER)
 #define RPC_DO_ROOTOVERRIDE(t)  ((t)->tk_flags & RPC_TASK_ROOTCREDS)
 #define RPC_ASSASSINATED(t)     ((t)->tk_flags & RPC_TASK_KILLED)
-#define RPC_IS_ACTIVATED(t)     ((t)->tk_active)
 #define RPC_DO_CALLBACK(t)      ((t)->tk_callback != NULL)
 #define RPC_IS_SOFT(t)          ((t)->tk_flags & RPC_TASK_SOFT)
 #define RPC_TASK_UNINTERRUPTIBLE(t) ((t)->tk_flags & RPC_TASK_NOINTR)
@@ -138,6 +142,7 @@ typedef void			(*rpc_action)(struct rpc_task *);
 #define RPC_TASK_QUEUED         1
 #define RPC_TASK_WAKEUP         2
 #define RPC_TASK_HAS_TIMER      3
+#define RPC_TASK_ACTIVE         4
 
 #define RPC_IS_RUNNING(t)       (test_bit(RPC_TASK_RUNNING, &(t)->tk_runstate))
 #define rpc_set_running(t)      (set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate))
@@ -168,6 +173,15 @@ typedef void			(*rpc_action)(struct rpc_task *);
                 smp_mb__after_clear_bit(); \
         } while (0)
 
+#define RPC_IS_ACTIVATED(t)     (test_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate))
+#define rpc_set_active(t)       (set_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate))
+#define rpc_clear_active(t)     \
+        do { \
+                smp_mb__before_clear_bit(); \
+                clear_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate); \
+                smp_mb__after_clear_bit(); \
+        } while(0)
+
 /*
  * Task priorities.
  * Note: if you change these, you must also change
@@ -228,11 +242,16 @@ struct rpc_wait_queue {
 /*
  * Function prototypes
  */
-struct rpc_task *rpc_new_task(struct rpc_clnt *, rpc_action, int flags);
+struct rpc_task *rpc_new_task(struct rpc_clnt *, int flags,
+                                const struct rpc_call_ops *ops, void *data);
+struct rpc_task *rpc_run_task(struct rpc_clnt *clnt, int flags,
+                                const struct rpc_call_ops *ops, void *data);
 struct rpc_task *rpc_new_child(struct rpc_clnt *, struct rpc_task *parent);
-void            rpc_init_task(struct rpc_task *, struct rpc_clnt *,
-                                        rpc_action exitfunc, int flags);
+void            rpc_init_task(struct rpc_task *task, struct rpc_clnt *clnt,
+                                int flags, const struct rpc_call_ops *ops,
+                                void *data);
 void            rpc_release_task(struct rpc_task *);
+void            rpc_exit_task(struct rpc_task *);
 void            rpc_killall_tasks(struct rpc_clnt *);
 int             rpc_execute(struct rpc_task *);
 void            rpc_run_child(struct rpc_task *parent, struct rpc_task *child,
@@ -247,9 +266,11 @@ struct rpc_task *rpc_wake_up_next(struct rpc_wait_queue *);
 void            rpc_wake_up_status(struct rpc_wait_queue *, int);
 void            rpc_delay(struct rpc_task *, unsigned long);
 void *          rpc_malloc(struct rpc_task *, size_t);
+void            rpc_free(struct rpc_task *);
 int             rpciod_up(void);
 void            rpciod_down(void);
 void            rpciod_wake_up(void);
+int             __rpc_wait_for_completion_task(struct rpc_task *task, int (*)(void *));
 #ifdef RPC_DEBUG
 void            rpc_show_tasks(void);
 #endif
@@ -259,7 +280,12 @@ void		rpc_destroy_mempool(void);
 static inline void rpc_exit(struct rpc_task *task, int status)
 {
         task->tk_status = status;
-        task->tk_action = NULL;
+        task->tk_action = rpc_exit_task;
+}
+
+static inline int rpc_wait_for_completion_task(struct rpc_task *task)
+{
+        return __rpc_wait_for_completion_task(task, NULL);
 }
 
 #ifdef RPC_DEBUG
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 5da968729cf8..84c35d42d250 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -91,7 +91,6 @@ struct xdr_buf {
 u32 *   xdr_encode_opaque_fixed(u32 *p, const void *ptr, unsigned int len);
 u32 *   xdr_encode_opaque(u32 *p, const void *ptr, 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_decode_string_inplace(u32 *p, char **sp, int *lenp, int maxlen);
 u32 *   xdr_encode_netobj(u32 *p, const struct xdr_netobj *);
 u32 *   xdr_decode_netobj(u32 *p, struct xdr_netobj *);
@@ -135,11 +134,6 @@ xdr_adjust_iovec(struct kvec *iov, u32 *p)
 }
 
 /*
- * Maximum number of iov's we use.
- */
-#define MAX_IOVEC       (12)
-
-/*
  * XDR buffer helper functions
  */
 extern void xdr_shift_buf(struct xdr_buf *, size_t);
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 3b8b6e823c70..6ef99b14ff09 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -79,21 +79,19 @@ struct rpc_rqst {
         void (*rq_release_snd_buf)(struct rpc_rqst *); /* release rq_enc_pages */
         struct list_head        rq_list;
 
+        __u32 *                 rq_buffer;      /* XDR encode buffer */
+        size_t                  rq_bufsize;
+
         struct xdr_buf          rq_private_buf;         /* The receive buffer
                                                          * used in the softirq.
                                                          */
         unsigned long           rq_majortimeo;  /* major timeout alarm */
         unsigned long           rq_timeout;     /* Current timeout value */
         unsigned int            rq_retries;     /* # of retries */
-        /*
-         * For authentication (e.g. auth_des)
-         */
-        u32                     rq_creddata[2];
         
         /*
          * Partial send handling
          */
-        
         u32                     rq_bytes_sent;  /* Bytes we have sent */
 
         unsigned long           rq_xtime;       /* when transmitted */
@@ -106,7 +104,10 @@ struct rpc_xprt_ops {
         void            (*set_buffer_size)(struct rpc_xprt *xprt, size_t sndsize, size_t rcvsize);
         int             (*reserve_xprt)(struct rpc_task *task);
         void            (*release_xprt)(struct rpc_xprt *xprt, struct rpc_task *task);
+        void            (*set_port)(struct rpc_xprt *xprt, unsigned short port);
         void            (*connect)(struct rpc_task *task);
+        void *          (*buf_alloc)(struct rpc_task *task, size_t size);
+        void            (*buf_free)(struct rpc_task *task);
         int             (*send_request)(struct rpc_task *task);
         void            (*set_retrans_timeout)(struct rpc_task *task);
         void            (*timer)(struct rpc_task *task);
@@ -253,6 +254,7 @@ int			xs_setup_tcp(struct rpc_xprt *xprt, struct rpc_timeout *to);
 #define XPRT_LOCKED             (0)
 #define XPRT_CONNECTED          (1)
 #define XPRT_CONNECTING         (2)
+#define XPRT_CLOSE_WAIT         (3)
 
 static inline void xprt_set_connected(struct rpc_xprt *xprt)
 {