summaryrefslogtreecommitdiffstats
path: root/linux-drd/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-...
diff options
context:
space:
mode:
authorGravatar Tom Willemse2014-02-02 14:23:06 +0100
committerGravatar Tom Willemse2014-02-02 14:23:06 +0100
commitc6f9b45fdbb2c80f6e3f492441df405102ddeb42 (patch)
tree06fd68db1dd65c83b58d6ea0c37a6399db8f50a5 /linux-drd/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch
parentbac16d5021bea59a91d1a8cf6edd0073d0f79738 (diff)
downloadpkgbuilds-c6f9b45fdbb2c80f6e3f492441df405102ddeb42.tar.gz
pkgbuilds-c6f9b45fdbb2c80f6e3f492441df405102ddeb42.zip
Update linux-drd to 3.13.1
Diffstat (limited to 'linux-drd/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch')
-rw-r--r--linux-drd/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/linux-drd/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch b/linux-drd/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch
new file mode 100644
index 0000000..5f2c3da
--- /dev/null
+++ b/linux-drd/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch
@@ -0,0 +1,32 @@
+From 3396f92f8be606ea485b0a82d4e7749a448b013b Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 5 Dec 2013 07:33:49 -0500
+Subject: [PATCH 4/6] rpc_pipe: remove the clntXX dir if creating the pipe
+ fails
+
+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>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.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.5.3
+