Merge tag '4.21-smb3-small-fixes' of git://git.samba.org/sfrench/cifs-2.6

[linux] / net / sunrpc / auth.c

diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 2debbab..1ff9768 100644 (file)
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -651,22 +651,13 @@ rpcauth_init_cred(struct rpc_cred *cred, const struct auth_cred *acred,
        INIT_LIST_HEAD(&cred->cr_lru);
        refcount_set(&cred->cr_count, 1);
        cred->cr_auth = auth;
+       cred->cr_flags = 0;
        cred->cr_ops = ops;
        cred->cr_expire = jiffies;
        cred->cr_cred = get_cred(acred->cred);
-       cred->cr_uid = acred->cred->fsuid;
 }
 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)