aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/auth_gss
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2005-09-23 11:08:25 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-09-23 12:39:00 -0400
commitf134585a7343d71f9be7f0cf97e2145f21dd10c6 (patch)
treef1eae77a5063e3748cd8deba9a13794ae0a9439c /net/sunrpc/auth_gss
parent3063d8a16643190f9e12e9c7e9f1ca56f7e7934e (diff)
Revert "[PATCH] RPC,NFS: new rpc_pipefs patch"
This reverts 17f4e6febca160a9f9dd4bdece9784577a2f4524 commit.
Diffstat (limited to 'net/sunrpc/auth_gss')
-rw-r--r--net/sunrpc/auth_gss/auth_gss.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index bd2555139fa9..d2b08f16c257 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -87,6 +87,7 @@ struct gss_auth {
87 struct list_head upcalls; 87 struct list_head upcalls;
88 struct rpc_clnt *client; 88 struct rpc_clnt *client;
89 struct dentry *dentry; 89 struct dentry *dentry;
90 char path[48];
90 spinlock_t lock; 91 spinlock_t lock;
91}; 92};
92 93
@@ -689,8 +690,10 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
689 if (err) 690 if (err)
690 goto err_put_mech; 691 goto err_put_mech;
691 692
692 gss_auth->dentry = rpc_mkpipe(clnt->cl_dentry, gss_auth->mech->gm_name, 693 snprintf(gss_auth->path, sizeof(gss_auth->path), "%s/%s",
693 clnt, &gss_upcall_ops, RPC_PIPE_WAIT_FOR_OPEN); 694 clnt->cl_pathname,
695 gss_auth->mech->gm_name);
696 gss_auth->dentry = rpc_mkpipe(gss_auth->path, clnt, &gss_upcall_ops, RPC_PIPE_WAIT_FOR_OPEN);
694 if (IS_ERR(gss_auth->dentry)) { 697 if (IS_ERR(gss_auth->dentry)) {
695 err = PTR_ERR(gss_auth->dentry); 698 err = PTR_ERR(gss_auth->dentry);
696 goto err_put_mech; 699 goto err_put_mech;
@@ -715,7 +718,7 @@ gss_destroy(struct rpc_auth *auth)
715 auth, auth->au_flavor); 718 auth, auth->au_flavor);
716 719
717 gss_auth = container_of(auth, struct gss_auth, rpc_auth); 720 gss_auth = container_of(auth, struct gss_auth, rpc_auth);
718 rpc_unlink(gss_auth->dentry); 721 rpc_unlink(gss_auth->path);
719 gss_mech_put(gss_auth->mech); 722 gss_mech_put(gss_auth->mech);
720 723
721 rpcauth_free_credcache(auth); 724 rpcauth_free_credcache(auth);