From 1bd2915aab25d021560c4d11b3b737fff6045780 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Sat, 5 Apr 2014 15:57:39 +0200 Subject: Update linux-drd to 3.14-1 --- ...move-the-clntXX-dir-if-creating-the-pipe-.patch | 32 ---------------------- 1 file changed, 32 deletions(-) delete mode 100644 linux-drd/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch (limited to 'linux-drd/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch') 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 deleted file mode 100644 index 5f2c3da..0000000 --- a/linux-drd/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3396f92f8be606ea485b0a82d4e7749a448b013b Mon Sep 17 00:00:00 2001 -From: Jeff Layton -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 -Signed-off-by: Trond Myklebust ---- - 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 - -- cgit v1.2.3-54-g00ecf