summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/netns.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-05-15 19:27:32 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-05-16 15:17:54 +0200
commit2aed8b476f3478be140df92bbfb182978e835504 (patch)
tree1ec837ead098b2eae7e4d8a8ad5f325c7591285e /net/sunrpc/netns.h
parentSUNRPC: Faster detection if gssd is actually running (diff)
downloadlinux-2aed8b476f3478be140df92bbfb182978e835504.tar.xz
linux-2aed8b476f3478be140df92bbfb182978e835504.zip
SUNRPC: Convert auth_gss pipe detection to work in namespaces
This seems to have been overlooked when we did the namespace conversion. If a container is running a legacy version of rpc.gssd then it will be disrupted if the global 'pipe_version' is set by a container running the new version of rpc.gssd. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/netns.h')
-rw-r--r--net/sunrpc/netns.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h
index 0827f641e8d7..74d948f5d5a1 100644
--- a/net/sunrpc/netns.h
+++ b/net/sunrpc/netns.h
@@ -28,6 +28,8 @@ struct sunrpc_net {
wait_queue_head_t gssp_wq;
struct rpc_clnt *gssp_clnt;
int use_gss_proxy;
+ int pipe_version;
+ atomic_t pipe_users;
struct proc_dir_entry *use_gssp_proc;
unsigned int gssd_running;