From: Andy Adamson <andros@netapp.com>
Date: Tue, 1 Mar 2011 01:34:06 +0000 (+0000)
Subject: NFSv4: remove CONFIG_NFS_V4 from nfs_read_data
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6f78befc417dd7122249706b49520da29ba58451;p=linux-beck.git

NFSv4: remove CONFIG_NFS_V4 from nfs_read_data

Cleanup nfs_read_data. We also won't use CONFIG_NFS_V4_1 for additional
NFSv4.1 fields in subsequent patches.

Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index b0068579bec2..51bfadbe24e2 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1016,9 +1016,7 @@ struct nfs_read_data {
 	unsigned int		npages;	/* Max length of pagevec */
 	struct nfs_readargs args;
 	struct nfs_readres  res;
-#ifdef CONFIG_NFS_V4
 	unsigned long		timestamp;	/* For lease renewal */
-#endif
 	struct page		*page_array[NFS_PAGEVEC_SIZE];
 };