diff options
author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-06-28 11:10:39 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-07-06 14:54:52 -0400 |
commit | 28ade856c0f724b1d74d7d683ec2dc0e98de60ae (patch) | |
tree | 3e11f9bfaf379cd3320d643acbff6491aaaaa9f4 /fs/nfs/netns.h | |
parent | 02a2779f223e9f77c114b0c64ca246b01c1dc563 (diff) | |
parent | bf11fbdb20b385157b046ea7781f04d0c62554a3 (diff) |
Merge branch 'containers'
Diffstat (limited to 'fs/nfs/netns.h')
-rw-r--r-- | fs/nfs/netns.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfs/netns.h b/fs/nfs/netns.h index fc9978c58265..c8374f74dce1 100644 --- a/fs/nfs/netns.h +++ b/fs/nfs/netns.h | |||
@@ -15,6 +15,8 @@ struct bl_dev_msg { | |||
15 | uint32_t major, minor; | 15 | uint32_t major, minor; |
16 | }; | 16 | }; |
17 | 17 | ||
18 | struct nfs_netns_client; | ||
19 | |||
18 | struct nfs_net { | 20 | struct nfs_net { |
19 | struct cache_detail *nfs_dns_resolve; | 21 | struct cache_detail *nfs_dns_resolve; |
20 | struct rpc_pipe *bl_device_pipe; | 22 | struct rpc_pipe *bl_device_pipe; |
@@ -29,6 +31,7 @@ struct nfs_net { | |||
29 | unsigned short nfs_callback_tcpport6; | 31 | unsigned short nfs_callback_tcpport6; |
30 | int cb_users[NFS4_MAX_MINOR_VERSION + 1]; | 32 | int cb_users[NFS4_MAX_MINOR_VERSION + 1]; |
31 | #endif | 33 | #endif |
34 | struct nfs_netns_client *nfs_client; | ||
32 | spinlock_t nfs_client_lock; | 35 | spinlock_t nfs_client_lock; |
33 | ktime_t boot_time; | 36 | ktime_t boot_time; |
34 | #ifdef CONFIG_PROC_FS | 37 | #ifdef CONFIG_PROC_FS |