5 files changed, 1 insertions, 17 deletions

diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index b9449aa27fed..5486082d3d63 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -133,7 +133,6 @@ struct rpc_credops {
         void                    (*crdestroy)(struct rpc_cred *);
 
         int                     (*crmatch)(struct auth_cred *, struct rpc_cred *, int);
-        struct rpc_cred *       (*crbind)(struct rpc_task *, struct rpc_cred *, int);
         __be32 *                (*crmarshal)(struct rpc_task *, __be32 *);
         int                     (*crrefresh)(struct rpc_task *);
         __be32 *                (*crvalidate)(struct rpc_task *, __be32 *);
@@ -167,7 +166,6 @@ int			rpcauth_list_flavors(rpc_authflavor_t *, int);
 struct rpc_cred *       rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *, int, gfp_t);
 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_generic_bind_cred(struct rpc_task *, struct rpc_cred *, int);
 void                    put_rpccred(struct rpc_cred *);
 __be32 *                rpcauth_marshcred(struct rpc_task *, __be32 *);
 __be32 *                rpcauth_checkverf(struct rpc_task *, __be32 *);
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 2debbaba7809..867ea9834bde 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -658,15 +658,6 @@ rpcauth_init_cred(struct rpc_cred *cred, const struct auth_cred *acred,
 }
 EXPORT_SYMBOL_GPL(rpcauth_init_cred);
 
-struct rpc_cred *
-rpcauth_generic_bind_cred(struct rpc_task *task, struct rpc_cred *cred, int lookupflags)
-{
-        dprintk("RPC: %5u holding %s cred %p\n", task->tk_pid,
-                        cred->cr_auth->au_ops->au_name, cred);
-        return get_rpccred(cred);
-}
-EXPORT_SYMBOL_GPL(rpcauth_generic_bind_cred);
-
 static struct rpc_cred *
 rpcauth_bind_root_cred(struct rpc_task *task, int lookupflags)
 {
@@ -724,8 +715,7 @@ rpcauth_bindcred(struct rpc_task *task, const struct cred *cred, int flags)
                 lookupflags |= RPCAUTH_LOOKUP_NEW;
         if (task->tk_op_cred)
                 /* Task must use exactly this rpc_cred */
-                new = task->tk_op_cred->cr_ops->crbind(task, task->tk_op_cred,
-                                                       lookupflags);
+                new = get_rpccred(task->tk_op_cred);
         else if (cred != NULL && cred != &machine_cred)
                 new = auth->au_ops->lookup_cred(auth, &acred, lookupflags);
         else if (cred == &machine_cred)
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 03a1cd5bfb43..4e1a2ebef814 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -2095,7 +2095,6 @@ static const struct rpc_credops gss_credops = {
         .cr_name                = "AUTH_GSS",
         .crdestroy              = gss_destroy_cred,
         .cr_init                = gss_cred_init,
-        .crbind                 = rpcauth_generic_bind_cred,
         .crmatch                = gss_match,
         .crmarshal              = gss_marshal,
         .crrefresh              = gss_refresh,
@@ -2110,7 +2109,6 @@ static const struct rpc_credops gss_credops = {
 static const struct rpc_credops gss_nullops = {
         .cr_name                = "AUTH_GSS",
         .crdestroy              = gss_destroy_nullcred,
-        .crbind                 = rpcauth_generic_bind_cred,
         .crmatch                = gss_match,
         .crmarshal              = gss_marshal,
         .crrefresh              = gss_refresh_null,
diff --git a/net/sunrpc/auth_null.c b/net/sunrpc/auth_null.c
index 830686e80bed..d0ceac57c06e 100644
--- a/net/sunrpc/auth_null.c
+++ b/net/sunrpc/auth_null.c
@@ -123,7 +123,6 @@ static
 const struct rpc_credops null_credops = {
         .cr_name        = "AUTH_NULL",
         .crdestroy      = nul_destroy_cred,
-        .crbind         = rpcauth_generic_bind_cred,
         .crmatch        = nul_match,
         .crmarshal      = nul_marshal,
         .crrefresh      = nul_refresh,
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index 6ee43bfbfb4b..bff113a411e0 100644
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -246,7 +246,6 @@ static
 const struct rpc_credops unix_credops = {
         .cr_name        = "AUTH_UNIX",
         .crdestroy      = unx_destroy_cred,
-        .crbind         = rpcauth_generic_bind_cred,
         .crmatch        = unx_match,
         .crmarshal      = unx_marshal,
         .crrefresh      = unx_refresh,