diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-26 21:33:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-26 21:33:05 +0200 |
| commit | 89ff77837a67994e4a4a20bb648687fbcc3083f2 (patch) | |
| tree | bba9c5c698f38a77bfe35bc26d8bd18c2e557df0 /net/sunrpc/netns.h | |
| parent | Merge tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | NFS: Fix SETCLIENTID fallback if GSS is not available (diff) | |
| download | linux-89ff77837a67994e4a4a20bb648687fbcc3083f2.tar.xz linux-89ff77837a67994e4a4a20bb648687fbcc3083f2.zip | |
Merge tag 'nfs-for-3.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust:
- Stable fix to prevent an rpc_task wakeup race
- Fix a NFSv4.1 session drain deadlock
- Fix a NFSv4/v4.1 mount regression when not running rpc.gssd
- Ensure auth_gss pipe detection works in namespaces
- Fix SETCLIENTID fallback if rpcsec_gss is not available
* tag 'nfs-for-3.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFS: Fix SETCLIENTID fallback if GSS is not available
SUNRPC: Prevent an rpc_task wakeup race
NFSv4.1 Fix a pNFS session draining deadlock
SUNRPC: Convert auth_gss pipe detection to work in namespaces
SUNRPC: Faster detection if gssd is actually running
SUNRPC: Fix a bug in gss_create_upcall
Diffstat (limited to 'net/sunrpc/netns.h')
| -rw-r--r-- | net/sunrpc/netns.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h index 7111a4c9113b..74d948f5d5a1 100644 --- a/net/sunrpc/netns.h +++ b/net/sunrpc/netns.h @@ -28,7 +28,11 @@ 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; }; extern int sunrpc_net_id; |