aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2011-07-31 16:39:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-31 20:27:04 -0400
commita00ed25cce6fe856388f89c7cd40da0eee7666a6 (patch)
tree24f7bfe891bfd40ed1f0013242c757c4be58b47e
parent24c3047095fa3954f114bfff2e37b8fcbb216396 (diff)
NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1
Fix two recently introduced compile problems: Fix a typo in fs/nfs/pnfs.h Move the pnfs_blksize declaration outside the CONFIG_NFS_V4 section in struct nfs_server. Reported-by: Jens Axboe <jaxboe@fusionio.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/nfs/pnfs.h2
-rw-r--r--include/linux/nfs_fs_sb.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index e0b5d80a43f6..01cbfd54f3cb 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -380,7 +380,7 @@ pnfs_roc_drain(struct inode *ino, u32 *barrier)
380} 380}
381 381
382static inline void set_pnfs_layoutdriver(struct nfs_server *s, 382static inline void set_pnfs_layoutdriver(struct nfs_server *s,
383 const struct nfs_fh *mntfh, u32 id); 383 const struct nfs_fh *mntfh, u32 id)
384{ 384{
385} 385}
386 386
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 82fdfc7987d6..b5479df8378d 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -131,6 +131,7 @@ struct nfs_server {
131 struct fscache_cookie *fscache; /* superblock cookie */ 131 struct fscache_cookie *fscache; /* superblock cookie */
132#endif 132#endif
133 133
134 u32 pnfs_blksize; /* layout_blksize attr */
134#ifdef CONFIG_NFS_V4 135#ifdef CONFIG_NFS_V4
135 u32 attr_bitmask[3];/* V4 bitmask representing the set 136 u32 attr_bitmask[3];/* V4 bitmask representing the set
136 of attributes supported on this 137 of attributes supported on this
@@ -145,7 +146,6 @@ struct nfs_server {
145 filesystem */ 146 filesystem */
146 struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */ 147 struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */
147 struct rpc_wait_queue roc_rpcwaitq; 148 struct rpc_wait_queue roc_rpcwaitq;
148 u32 pnfs_blksize; /* layout_blksize attr */
149 void *pnfs_ld_data; /* per mount point data */ 149 void *pnfs_ld_data; /* per mount point data */
150 150
151 /* the following fields are protected by nfs_client->cl_lock */ 151 /* the following fields are protected by nfs_client->cl_lock */