diff options
Diffstat (limited to 'include/linux/nfs_fs_sb.h')
-rw-r--r-- | include/linux/nfs_fs_sb.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 87694ca86914..b5479df8378d 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <linux/nfs_xdr.h> | 7 | #include <linux/nfs_xdr.h> |
8 | #include <linux/sunrpc/xprt.h> | 8 | #include <linux/sunrpc/xprt.h> |
9 | 9 | ||
10 | #include <asm/atomic.h> | 10 | #include <linux/atomic.h> |
11 | 11 | ||
12 | struct nfs4_session; | 12 | struct nfs4_session; |
13 | struct nfs_iostats; | 13 | struct nfs_iostats; |
@@ -16,6 +16,7 @@ struct nfs4_sequence_args; | |||
16 | struct nfs4_sequence_res; | 16 | struct nfs4_sequence_res; |
17 | struct nfs_server; | 17 | struct nfs_server; |
18 | struct nfs4_minor_version_ops; | 18 | struct nfs4_minor_version_ops; |
19 | struct server_scope; | ||
19 | 20 | ||
20 | /* | 21 | /* |
21 | * The nfs_client identifies our client state to the server. | 22 | * The nfs_client identifies our client state to the server. |
@@ -77,12 +78,13 @@ struct nfs_client { | |||
77 | /* The flags used for obtaining the clientid during EXCHANGE_ID */ | 78 | /* The flags used for obtaining the clientid during EXCHANGE_ID */ |
78 | u32 cl_exchange_flags; | 79 | u32 cl_exchange_flags; |
79 | struct nfs4_session *cl_session; /* sharred session */ | 80 | struct nfs4_session *cl_session; /* sharred session */ |
80 | struct list_head cl_layouts; | ||
81 | #endif /* CONFIG_NFS_V4 */ | 81 | #endif /* CONFIG_NFS_V4 */ |
82 | 82 | ||
83 | #ifdef CONFIG_NFS_FSCACHE | 83 | #ifdef CONFIG_NFS_FSCACHE |
84 | struct fscache_cookie *fscache; /* client index cache cookie */ | 84 | struct fscache_cookie *fscache; /* client index cache cookie */ |
85 | #endif | 85 | #endif |
86 | |||
87 | struct server_scope *server_scope; /* from exchange_id */ | ||
86 | }; | 88 | }; |
87 | 89 | ||
88 | /* | 90 | /* |
@@ -129,8 +131,9 @@ struct nfs_server { | |||
129 | struct fscache_cookie *fscache; /* superblock cookie */ | 131 | struct fscache_cookie *fscache; /* superblock cookie */ |
130 | #endif | 132 | #endif |
131 | 133 | ||
134 | u32 pnfs_blksize; /* layout_blksize attr */ | ||
132 | #ifdef CONFIG_NFS_V4 | 135 | #ifdef CONFIG_NFS_V4 |
133 | u32 attr_bitmask[2];/* V4 bitmask representing the set | 136 | u32 attr_bitmask[3];/* V4 bitmask representing the set |
134 | of attributes supported on this | 137 | of attributes supported on this |
135 | filesystem */ | 138 | filesystem */ |
136 | u32 cache_consistency_bitmask[2]; | 139 | u32 cache_consistency_bitmask[2]; |
@@ -143,12 +146,14 @@ struct nfs_server { | |||
143 | filesystem */ | 146 | filesystem */ |
144 | struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */ | 147 | struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */ |
145 | struct rpc_wait_queue roc_rpcwaitq; | 148 | struct rpc_wait_queue roc_rpcwaitq; |
149 | void *pnfs_ld_data; /* per mount point data */ | ||
146 | 150 | ||
147 | /* the following fields are protected by nfs_client->cl_lock */ | 151 | /* the following fields are protected by nfs_client->cl_lock */ |
148 | struct rb_root state_owners; | 152 | struct rb_root state_owners; |
149 | struct rb_root openowner_id; | 153 | struct rb_root openowner_id; |
150 | struct rb_root lockowner_id; | 154 | struct rb_root lockowner_id; |
151 | #endif | 155 | #endif |
156 | struct list_head layouts; | ||
152 | struct list_head delegations; | 157 | struct list_head delegations; |
153 | void (*destroy)(struct nfs_server *); | 158 | void (*destroy)(struct nfs_server *); |
154 | 159 | ||