diff options
author | Fred Isaman <iisaman@citi.umich.edu> | 2011-07-30 20:52:37 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-31 12:18:15 -0400 |
commit | dae100c2b1b9463996aab9162f2258145c43f7df (patch) | |
tree | 302638375d4e6a0400964ae160216080760d984a /include/linux/nfs_fs_sb.h | |
parent | 738fd0f360359aecc7fcd7604bbe9e854d81fb1f (diff) |
pnfs: ask for layout_blksize and save it in nfs_server
Block layout needs it to determine IO size.
Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Tao Guo <glorioustao@gmail.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Benny Halevy <bhalevy@tonian.com>
Signed-off-by: Jim Rees <rees@umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/nfs_fs_sb.h')
-rw-r--r-- | include/linux/nfs_fs_sb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 4faeac8f448a..b2ea8b82d2cb 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h | |||
@@ -132,7 +132,7 @@ struct nfs_server { | |||
132 | #endif | 132 | #endif |
133 | 133 | ||
134 | #ifdef CONFIG_NFS_V4 | 134 | #ifdef CONFIG_NFS_V4 |
135 | u32 attr_bitmask[2];/* V4 bitmask representing the set | 135 | u32 attr_bitmask[3];/* V4 bitmask representing the set |
136 | of attributes supported on this | 136 | of attributes supported on this |
137 | filesystem */ | 137 | filesystem */ |
138 | u32 cache_consistency_bitmask[2]; | 138 | u32 cache_consistency_bitmask[2]; |
@@ -145,6 +145,7 @@ struct nfs_server { | |||
145 | filesystem */ | 145 | filesystem */ |
146 | struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */ | 146 | struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */ |
147 | struct rpc_wait_queue roc_rpcwaitq; | 147 | struct rpc_wait_queue roc_rpcwaitq; |
148 | u32 pnfs_blksize; /* layout_blksize attr */ | ||
148 | 149 | ||
149 | /* the following fields are protected by nfs_client->cl_lock */ | 150 | /* the following fields are protected by nfs_client->cl_lock */ |
150 | struct rb_root state_owners; | 151 | struct rb_root state_owners; |