diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-15 10:00:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-15 10:00:09 +0200 |
| commit | c9572f010d369d9905309f63e31180f291b66a8a (patch) | |
| tree | fbca2a0576c4223790e23a3c1d5f50e2bdf64e10 /net/sunrpc/netns.h | |
| parent | 58cea307432e3376293e6b2be88d1f6e6e99274a (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
Merge tag 'v3.11-rc5' into perf/core
Merge Linux 3.11-rc5, to sync up with the latest upstream fixes since -rc1.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/sunrpc/netns.h')
| -rw-r--r-- | net/sunrpc/netns.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h index 74d948f5d5a..779742cfc1f 100644 --- a/net/sunrpc/netns.h +++ b/net/sunrpc/netns.h @@ -23,6 +23,7 @@ struct sunrpc_net { struct rpc_clnt *rpcb_local_clnt4; spinlock_t rpcb_clnt_lock; unsigned int rpcb_users; + unsigned int rpcb_is_af_local : 1; struct mutex gssp_lock; wait_queue_head_t gssp_wq; |