1 files changed, 73 insertions, 22 deletions

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index f684ce606667..1a6fa9173519 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -757,6 +757,73 @@ gss_pipe_destroy_msg(struct rpc_pipe_msg *msg)
         }
 }
 
+static void gss_pipes_dentries_destroy(struct rpc_auth *auth)
+{
+        struct gss_auth *gss_auth;
+
+        gss_auth = container_of(auth, struct gss_auth, rpc_auth);
+        rpc_unlink(gss_auth->pipe[0]->dentry);
+        rpc_unlink(gss_auth->pipe[1]->dentry);
+}
+
+static int gss_pipes_dentries_create(struct rpc_auth *auth)
+{
+        int err;
+        struct gss_auth *gss_auth;
+        struct rpc_clnt *clnt;
+
+        gss_auth = container_of(auth, struct gss_auth, rpc_auth);
+        clnt = gss_auth->client;
+
+        gss_auth->pipe[1]->dentry = rpc_mkpipe_dentry(clnt->cl_path.dentry,
+                                                      "gssd",
+                                                      clnt, gss_auth->pipe[1]);
+        if (IS_ERR(gss_auth->pipe[1]->dentry))
+                return PTR_ERR(gss_auth->pipe[1]->dentry);
+        gss_auth->pipe[0]->dentry = rpc_mkpipe_dentry(clnt->cl_path.dentry,
+                                                      gss_auth->mech->gm_name,
+                                                      clnt, gss_auth->pipe[0]);
+        if (IS_ERR(gss_auth->pipe[0]->dentry)) {
+                err = PTR_ERR(gss_auth->pipe[0]->dentry);
+                goto err_unlink_pipe_1;
+        }
+        return 0;
+
+err_unlink_pipe_1:
+        rpc_unlink(gss_auth->pipe[1]->dentry);
+        return err;
+}
+
+static void gss_pipes_dentries_destroy_net(struct rpc_clnt *clnt,
+                                           struct rpc_auth *auth)
+{
+        struct net *net = clnt->cl_xprt->xprt_net;
+        struct super_block *sb;
+
+        sb = rpc_get_sb_net(net);
+        if (sb) {
+                if (clnt->cl_path.dentry)
+                        gss_pipes_dentries_destroy(auth);
+                rpc_put_sb_net(net);
+        }
+}
+
+static int gss_pipes_dentries_create_net(struct rpc_clnt *clnt,
+                                         struct rpc_auth *auth)
+{
+        struct net *net = clnt->cl_xprt->xprt_net;
+        struct super_block *sb;
+        int err = 0;
+
+        sb = rpc_get_sb_net(net);
+        if (sb) {
+                if (clnt->cl_path.dentry)
+                        err = gss_pipes_dentries_create(auth);
+                rpc_put_sb_net(net);
+        }
+        return err;
+}
+
 /*
  * NOTE: we have the opportunity to use different
  * parameters based on the input flavor (which must be a pseudoflavor)
@@ -812,31 +879,16 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
                 err = PTR_ERR(gss_auth->pipe[0]);
                 goto err_destroy_pipe_1;
         }
-
-        gss_auth->pipe[1]->dentry = rpc_mkpipe_dentry(clnt->cl_path.dentry,
-                                                      "gssd",
-                                                      clnt, gss_auth->pipe[1]);
-        if (IS_ERR(gss_auth->pipe[1]->dentry)) {
-                err = PTR_ERR(gss_auth->pipe[1]->dentry);
+        err = gss_pipes_dentries_create_net(clnt, auth);
+        if (err)
                 goto err_destroy_pipe_0;
-        }
-
-        gss_auth->pipe[0]->dentry = rpc_mkpipe_dentry(clnt->cl_path.dentry,
-                                                      gss_auth->mech->gm_name,
-                                                      clnt, gss_auth->pipe[0]);
-        if (IS_ERR(gss_auth->pipe[0]->dentry)) {
-                err = PTR_ERR(gss_auth->pipe[0]->dentry);
-                goto err_unlink_pipe_1;
-        }
         err = rpcauth_init_credcache(auth);
         if (err)
-                goto err_unlink_pipe_0;
+                goto err_unlink_pipes;
 
         return auth;
-err_unlink_pipe_0:
-        rpc_unlink(gss_auth->pipe[0]->dentry);
-err_unlink_pipe_1:
-        rpc_unlink(gss_auth->pipe[1]->dentry);
+err_unlink_pipes:
+        gss_pipes_dentries_destroy_net(clnt, auth);
 err_destroy_pipe_0:
         rpc_destroy_pipe_data(gss_auth->pipe[0]);
 err_destroy_pipe_1:
@@ -853,8 +905,7 @@ out_dec:
 static void
 gss_free(struct gss_auth *gss_auth)
 {
-        rpc_unlink(gss_auth->pipe[0]->dentry);
-        rpc_unlink(gss_auth->pipe[1]->dentry);
+        gss_pipes_dentries_destroy_net(gss_auth->client, &gss_auth->rpc_auth);
         rpc_destroy_pipe_data(gss_auth->pipe[0]);
         rpc_destroy_pipe_data(gss_auth->pipe[1]);
         gss_mech_put(gss_auth->mech);