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 {
 
         struct rpc_cred *       (*lookup_cred)(struct rpc_auth *, struct auth_cred *, int);
         struct rpc_cred *       (*crcreate)(struct rpc_auth*, struct auth_cred *, int);
-        int                     (*pipes_create)(struct rpc_auth *);
-        void                    (*pipes_destroy)(struct rpc_auth *);
         int                     (*list_pseudoflavors)(rpc_authflavor_t *, int);
         rpc_authflavor_t        (*info2flavor)(struct rpcsec_gss_info *);
         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)
 
 static void __rpc_clnt_remove_pipedir(struct rpc_clnt *clnt)
 {
-        if (clnt->cl_dentry) {
-                if (clnt->cl_auth && clnt->cl_auth->au_ops->pipes_destroy)
-                        clnt->cl_auth->au_ops->pipes_destroy(clnt->cl_auth);
+        if (clnt->cl_dentry)
                 rpc_remove_client_dir(clnt->cl_dentry, clnt);
-        }
         clnt->cl_dentry = NULL;
 }
 
@@ -195,11 +192,6 @@ static int __rpc_clnt_handle_event(struct rpc_clnt *clnt, unsigned long event,
                 if (IS_ERR(dentry))
                         return PTR_ERR(dentry);
                 clnt->cl_dentry = dentry;
-                if (clnt->cl_auth->au_ops->pipes_create) {
-                        err = clnt->cl_auth->au_ops->pipes_create(clnt->cl_auth);
-                        if (err)
-                                __rpc_clnt_remove_pipedir(clnt);
-                }
                 break;
         case RPC_PIPEFS_UMOUNT:
                 __rpc_clnt_remove_pipedir(clnt);