diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-23 16:15:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-23 16:15:08 -0300 |
| commit | 44ae571c1d57a21af2c915b42bb656cf0d69c9ee (patch) | |
| tree | 757e53f443e27a95d1b1b0cdf337c2147953fc46 /kernels/linux-libre-xen/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch | |
| parent | eadbb9961b89668e4aed317f5dd97cb04e86663e (diff) | |
| parent | 1d20e4962664ab152948a14b4320b12204a1053e (diff) | |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/libftdi/PKGBUILD
community/lxshortcut/PKGBUILD
community/pcmanfm/PKGBUILD
community/qingy/PKGBUILD
community/yagf/PKGBUILD
extra/ethtool/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/postgresql/PKGBUILD
extra/xfburn/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'kernels/linux-libre-xen/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch')
| -rw-r--r-- | kernels/linux-libre-xen/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/kernels/linux-libre-xen/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch b/kernels/linux-libre-xen/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch new file mode 100644 index 000000000..5f2c3dae8 --- /dev/null +++ b/kernels/linux-libre-xen/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 + |