1 files changed, 10 insertions, 7 deletions

diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index 7a69ca3bebaf..3f632182d8eb 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -26,6 +26,7 @@ struct auth_cred {
         uid_t   uid;
         gid_t   gid;
         struct group_info *group_info;
+        unsigned char machine_cred : 1;
 };
 
 /*
@@ -59,8 +60,8 @@ struct rpc_cred {
 /*
  * Client authentication handle
  */
-#define RPC_CREDCACHE_NR        8
-#define RPC_CREDCACHE_MASK      (RPC_CREDCACHE_NR - 1)
+#define RPC_CREDCACHE_HASHBITS  4
+#define RPC_CREDCACHE_NR        (1 << RPC_CREDCACHE_HASHBITS)
 struct rpc_cred_cache {
         struct hlist_head       hashtable[RPC_CREDCACHE_NR];
         spinlock_t              lock;
@@ -89,7 +90,6 @@ struct rpc_auth {
 
 /* Flags for rpcauth_lookupcred() */
 #define RPCAUTH_LOOKUP_NEW              0x01    /* Accept an uninitialised cred */
-#define RPCAUTH_LOOKUP_ROOTCREDS        0x02    /* This really ought to go! */
 
 /*
  * Client authentication ops
@@ -97,9 +97,7 @@ struct rpc_auth {
 struct rpc_authops {
         struct module           *owner;
         rpc_authflavor_t        au_flavor;      /* flavor (RPC_AUTH_*) */
-#ifdef RPC_DEBUG
         char *                  au_name;
-#endif
         struct rpc_auth *       (*create)(struct rpc_clnt *, rpc_authflavor_t);
         void                    (*destroy)(struct rpc_auth *);
 
@@ -113,6 +111,7 @@ struct rpc_credops {
         void                    (*crdestroy)(struct rpc_cred *);
 
         int                     (*crmatch)(struct auth_cred *, struct rpc_cred *, int);
+        void                    (*crbind)(struct rpc_task *, struct rpc_cred *);
         __be32 *                (*crmarshal)(struct rpc_task *, __be32 *);
         int                     (*crrefresh)(struct rpc_task *);
         __be32 *                (*crvalidate)(struct rpc_task *, __be32 *);
@@ -126,9 +125,13 @@ extern const struct rpc_authops	authunix_ops;
 extern const struct rpc_authops authnull_ops;
 
 void __init             rpc_init_authunix(void);
+void __init             rpc_init_generic_auth(void);
 void __init             rpcauth_init_module(void);
 void __exit             rpcauth_remove_module(void);
+void __exit             rpc_destroy_generic_auth(void);
 
+struct rpc_cred *       rpc_lookup_cred(void);
+struct rpc_cred *       rpc_lookup_machine_cred(void);
 int                     rpcauth_register(const struct rpc_authops *);
 int                     rpcauth_unregister(const struct rpc_authops *);
 struct rpc_auth *       rpcauth_create(rpc_authflavor_t, struct rpc_clnt *);
@@ -136,8 +139,8 @@ void			rpcauth_release(struct rpc_auth *);
 struct rpc_cred *       rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *, int);
 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);
-struct rpc_cred *       rpcauth_bindcred(struct rpc_task *);
-void                    rpcauth_holdcred(struct rpc_task *);
+void                    rpcauth_bindcred(struct rpc_task *, struct rpc_cred *, int);
+void                    rpcauth_generic_bind_cred(struct rpc_task *, struct rpc_cred *);
 void                    put_rpccred(struct rpc_cred *);
 void                    rpcauth_unbindcred(struct rpc_task *);
 __be32 *                rpcauth_marshcred(struct rpc_task *, __be32 *);