summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2011-07-31 20:39:04 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-01 00:27:04 (GMT)
commita00ed25cce6fe856388f89c7cd40da0eee7666a6 (patch)
tree24f7bfe891bfd40ed1f0013242c757c4be58b47e /fs/nfs
parent24c3047095fa3954f114bfff2e37b8fcbb216396 (diff)
downloadlinux-a00ed25cce6fe856388f89c7cd40da0eee7666a6.tar.xz
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>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/pnfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index e0b5d80..01cbfd5 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -380,7 +380,7 @@ pnfs_roc_drain(struct inode *ino, u32 *barrier)
}
static inline void set_pnfs_layoutdriver(struct nfs_server *s,
- const struct nfs_fh *mntfh, u32 id);
+ const struct nfs_fh *mntfh, u32 id)
{
}