diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-08-26 16:47:20 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-01 11:12:41 -0400 |
commit | 5f42b016d7341871948a2b8cc8fb654691522d1a (patch) | |
tree | 0ac9122b385ec7e03d0c7904b4d27445e7866b78 | |
parent | 1917228435eebdf4e3267fa95cace694b2fb4efd (diff) |
SUNRPC: Remove the obsolete auth-only interface for pipefs dentry management
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | include/linux/sunrpc/auth.h | 2 | ||||
-rw-r--r-- | net/sunrpc/clnt.c | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h index a9ab577b0c4a..6de26f2491e5 100644 --- a/include/linux/sunrpc/auth.h +++ b/include/linux/sunrpc/auth.h | |||
@@ -107,8 +107,6 @@ struct rpc_authops { | |||
107 | 107 | ||
108 | struct rpc_cred * (*lookup_cred)(struct rpc_auth *, struct auth_cred *, int); | 108 | struct rpc_cred * (*lookup_cred)(struct rpc_auth *, struct auth_cred *, int); |
109 | struct rpc_cred * (*crcreate)(struct rpc_auth*, struct auth_cred *, int); | 109 | struct rpc_cred * (*crcreate)(struct rpc_auth*, struct auth_cred *, int); |
110 | int (*pipes_create)(struct rpc_auth *); | ||
111 | void (*pipes_destroy)(struct rpc_auth *); | ||
112 | int (*list_pseudoflavors)(rpc_authflavor_t *, int); | 110 | int (*list_pseudoflavors)(rpc_authflavor_t *, int); |
113 | rpc_authflavor_t (*info2flavor)(struct rpcsec_gss_info *); | 111 | rpc_authflavor_t (*info2flavor)(struct rpcsec_gss_info *); |
114 | int (*flavor2info)(rpc_authflavor_t, | 112 | int (*flavor2info)(rpc_authflavor_t, |
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 01d22961a0ce..3c074de902ea 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -102,11 +102,8 @@ static void rpc_unregister_client(struct rpc_clnt *clnt) | |||
102 | 102 | ||
103 | static void __rpc_clnt_remove_pipedir(struct rpc_clnt *clnt) | 103 | static void __rpc_clnt_remove_pipedir(struct rpc_clnt *clnt) |
104 | { | 104 | { |
105 | if (clnt->cl_dentry) { | 105 | if (clnt->cl_dentry) |
106 | if (clnt->cl_auth && clnt->cl_auth->au_ops->pipes_destroy) | ||
107 | clnt->cl_auth->au_ops->pipes_destroy(clnt->cl_auth); | ||
108 | rpc_remove_client_dir(clnt->cl_dentry, clnt); | 106 | rpc_remove_client_dir(clnt->cl_dentry, clnt); |
109 | } | ||
110 | clnt->cl_dentry = NULL; | 107 | clnt->cl_dentry = NULL; |
111 | } | 108 | } |
112 | 109 | ||
@@ -195,11 +192,6 @@ static int __rpc_clnt_handle_event(struct rpc_clnt *clnt, unsigned long event, | |||
195 | if (IS_ERR(dentry)) | 192 | if (IS_ERR(dentry)) |
196 | return PTR_ERR(dentry); | 193 | return PTR_ERR(dentry); |
197 | clnt->cl_dentry = dentry; | 194 | clnt->cl_dentry = dentry; |
198 | if (clnt->cl_auth->au_ops->pipes_create) { | ||
199 | err = clnt->cl_auth->au_ops->pipes_create(clnt->cl_auth); | ||
200 | if (err) | ||
201 | __rpc_clnt_remove_pipedir(clnt); | ||
202 | } | ||
203 | break; | 195 | break; |
204 | case RPC_PIPEFS_UMOUNT: | 196 | case RPC_PIPEFS_UMOUNT: |
205 | __rpc_clnt_remove_pipedir(clnt); | 197 | __rpc_clnt_remove_pipedir(clnt); |