2 files changed, 16 insertions, 5 deletions

diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index eed3cb16ccf1..96e237f8e60b 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -131,11 +131,12 @@ struct rpc_credops {
         void                    (*crdestroy)(struct rpc_cred *);
 
         int                     (*crmatch)(struct auth_cred *, struct rpc_cred *, int);
-        __be32 *                (*crmarshal)(struct rpc_task *, __be32 *);
+        int                     (*crmarshal)(struct rpc_task *task,
+                                             struct xdr_stream *xdr);
         int                     (*crrefresh)(struct rpc_task *);
         __be32 *                (*crvalidate)(struct rpc_task *, __be32 *);
-        int                     (*crwrap_req)(struct rpc_task *, kxdreproc_t,
-                                                void *, __be32 *, void *);
+        int                     (*crwrap_req)(struct rpc_task *task,
+                                              struct xdr_stream *xdr);
         int                     (*crunwrap_resp)(struct rpc_task *, kxdrdproc_t,
                                                 void *, __be32 *, void *);
         int                     (*crkey_timeout)(struct rpc_cred *);
@@ -165,9 +166,13 @@ struct rpc_cred *	rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *
 void                    rpcauth_init_cred(struct rpc_cred *, const struct auth_cred *, struct rpc_auth *, const struct rpc_credops *);
 struct rpc_cred *       rpcauth_lookupcred(struct rpc_auth *, int);
 void                    put_rpccred(struct rpc_cred *);
-__be32 *                rpcauth_marshcred(struct rpc_task *, __be32 *);
+int                     rpcauth_marshcred(struct rpc_task *task,
+                                          struct xdr_stream *xdr);
 __be32 *                rpcauth_checkverf(struct rpc_task *, __be32 *);
-int                     rpcauth_wrap_req(struct rpc_task *task, kxdreproc_t encode, void *rqstp, __be32 *data, void *obj);
+int                     rpcauth_wrap_req_encode(struct rpc_task *task,
+                                                struct xdr_stream *xdr);
+int                     rpcauth_wrap_req(struct rpc_task *task,
+                                         struct xdr_stream *xdr);
 int                     rpcauth_unwrap_resp(struct rpc_task *task, kxdrdproc_t decode, void *rqstp, __be32 *data, void *obj);
 bool                    rpcauth_xmit_need_reencode(struct rpc_task *task);
 int                     rpcauth_refreshcred(struct rpc_task *);
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 787939d13643..6df9ac1ca471 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -87,6 +87,12 @@ xdr_buf_init(struct xdr_buf *buf, void *start, size_t len)
 #define xdr_one         cpu_to_be32(1)
 #define xdr_two         cpu_to_be32(2)
 
+#define rpc_auth_null   cpu_to_be32(RPC_AUTH_NULL)
+#define rpc_auth_unix   cpu_to_be32(RPC_AUTH_UNIX)
+#define rpc_auth_gss    cpu_to_be32(RPC_AUTH_GSS)
+
+#define rpc_call        cpu_to_be32(RPC_CALL)
+
 #define rpc_success             cpu_to_be32(RPC_SUCCESS)
 #define rpc_prog_unavail        cpu_to_be32(RPC_PROG_UNAVAIL)
 #define rpc_prog_mismatch       cpu_to_be32(RPC_PROG_MISMATCH)