Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a00ed25c authored by Trond Myklebust's avatar Trond Myklebust Committed by Linus Torvalds
Browse files

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: default avatarJens Axboe <jaxboe@fusionio.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 24c30470

fs/nfs/pnfs.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

}

include/linux/nfs_fs_sb.h

+1 −1
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ struct nfs_server { 
	struct fscache_cookie	*fscache;	/* superblock cookie */

#endif



	u32			pnfs_blksize;	/* layout_blksize attr */

#ifdef CONFIG_NFS_V4

	u32			attr_bitmask[3];/* V4 bitmask representing the set

						   of attributes supported on this
@@ -145,7 +146,6 @@ struct nfs_server { 
						   filesystem */

	struct pnfs_layoutdriver_type  *pnfs_curr_ld; /* Active layout driver */

	struct rpc_wait_queue	roc_rpcwaitq;

	u32			pnfs_blksize;	/* layout_blksize attr */

	void			*pnfs_ld_data;	/* per mount point data */



	/* the following fields are protected by nfs_client->cl_lock */