summaryrefslogtreecommitdiffstats
path: root/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-12-20 08:35:28 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2013-12-20 08:50:04 -0500
commit751f52f87817a4a9a39bcde26a7d32742f735486 (patch)
tree950598ca03826ad8fcd3d8649b0e9d43034017e0 /rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch
parent57f3306e4c0b9b76aef2ec6709e1347116cdd3c1 (diff)
downloadkernel-751f52f87817a4a9a39bcde26a7d32742f735486.tar.gz
kernel-751f52f87817a4a9a39bcde26a7d32742f735486.tar.xz
kernel-751f52f87817a4a9a39bcde26a7d32742f735486.zip
Add patches to fix dummy gssd entry (rhbz 1037793)
Diffstat (limited to 'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch')
-rw-r--r--rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch b/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch
new file mode 100644
index 000000000..e4b1a255f
--- /dev/null
+++ b/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch
@@ -0,0 +1,32 @@
+Bugzilla: 1037793
+Upstream-status: submitted for 3.14
+
+In the event that we create the gssd/clntXX dir, but the pipe creation
+subsequently fails, then we should remove the clntXX dir before
+returning.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+---
+ net/sunrpc/rpc_pipe.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 5cd7ad1..0b74c61 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -1313,6 +1313,8 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
+ }
+
+ pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data);
++ if (IS_ERR(pipe_dentry))
++ __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
+ out:
+ dput(clnt_dentry);
+ dput(gssd_dentry);
+--
+1.8.4.2
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html