diff options
| author | Britney Fransen <brfransen@gmail.com> | 2014-10-27 20:28:27 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2014-10-27 20:28:27 (GMT) |
| commit | f7b823f55a80b1498c30e9f3a47692a2329c4f09 (patch) | |
| tree | 6de557714e6336282fbc0ab16c6578386dfc6654 /abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch | |
| parent | 4c2a2e3504f472628285a989c7c9a76be6855f54 (diff) | |
| parent | 01c1a60f3b7f93b3ed7404196c2cf798c4d8c674 (diff) | |
| download | linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.zip linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.tar.gz linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch')
| -rw-r--r-- | abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch b/abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch new file mode 100644 index 0000000..75505c3 --- /dev/null +++ b/abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch @@ -0,0 +1,50 @@ +From 23e66ba97127ff3b064d4c6c5138aa34eafc492f Mon Sep 17 00:00:00 2001 +From: Jeff Layton <jlayton@redhat.com> +Date: Mon, 9 Dec 2013 09:38:00 -0500 +Subject: [PATCH 6/6] rpc_pipe: fix cleanup of dummy gssd directory when + notification fails + +Currently, it could leak dentry references in some cases. Make sure +we clean up properly. + +Signed-off-by: Jeff Layton <jlayton@redhat.com> +Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> +--- + net/sunrpc/rpc_pipe.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c +index 5d973b2..b185548 100644 +--- a/net/sunrpc/rpc_pipe.c ++++ b/net/sunrpc/rpc_pipe.c +@@ -1369,6 +1369,18 @@ out: + return pipe_dentry; + } + ++static void ++rpc_gssd_dummy_depopulate(struct dentry *pipe_dentry) ++{ ++ struct dentry *clnt_dir = pipe_dentry->d_parent; ++ struct dentry *gssd_dir = clnt_dir->d_parent; ++ ++ __rpc_rmpipe(clnt_dir->d_inode, pipe_dentry); ++ __rpc_depopulate(clnt_dir, gssd_dummy_info_file, 0, 1); ++ __rpc_depopulate(gssd_dir, gssd_dummy_clnt_dir, 0, 1); ++ dput(pipe_dentry); ++} ++ + static int + rpc_fill_super(struct super_block *sb, void *data, int silent) + { +@@ -1412,7 +1424,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) + return 0; + + err_depopulate: +- dput(gssd_dentry); ++ rpc_gssd_dummy_depopulate(gssd_dentry); + blocking_notifier_call_chain(&rpc_pipefs_notifier_list, + RPC_PIPEFS_UMOUNT, + sb); +-- +1.8.5.3 + |