NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Sun, 31 Jul 2011 20:39:04 +0000 (16:39 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Aug 2011 00:27:04 +0000 (14:27 -1000)
commita00ed25cce6fe856388f89c7cd40da0eee7666a6
tree24f7bfe891bfd40ed1f0013242c757c4be58b47e
parent24c3047095fa3954f114bfff2e37b8fcbb216396
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>
fs/nfs/pnfs.h
include/linux/nfs_fs_sb.h