@@ -1016,15 +1016,11 @@ struct nfs_read_data {
unsigned int npages; /* Max length of pagevec */
struct nfs_readargs args;
struct nfs_readres res;
- struct pnfs_layout_segment *lseg;
- struct nfs_client *ds_clp; /* pNFS data server */
-#ifdef CONFIG_NFS_V4
unsigned long timestamp; /* For lease renewal */
-#endif
-#if defined(CONFIG_NFS_V4_1)
- const struct rpc_call_ops *call_ops;
- __u64 orig_offset; /* For filelayout dense stripe */
-#endif /* CONFIG_NFS_V4_1 */
+ struct pnfs_layout_segment *lseg;
+ struct nfs_client *ds_clp; /* pNFS data server */
+ const struct rpc_call_ops *call_ops; /* For pNFS recovery to MDS */
+ __u64 orig_offset; /* Filelayout dense stripe */
struct page *page_array[NFS_PAGEVEC_SIZE];
};