Re: Please pull NFS client changes

[Trond Myklebust <Trond.Myklebust@netapp.com>]

On Sun, 2011-07-31 at 21:46 +0200, Jens Axboe wrote: 
> On 2011-07-31 21:39, Trond Myklebust wrote:
> > On Sun, 2011-07-31 at 21:14 +0200, Jens Axboe wrote: 
> >> On 2011-07-31 20:24, Christoph Hellwig wrote:
> >>> How does this manage to include the pnfs block code, which only was posted
> >>> on the list a few hours before the pull request, and which doesn't
> >>> appear to past testing very well (although the major issue seems to be
> >>> core nfs code)?
> >>
> >> And it doesn't even compile:
> >>
> >> In file included from fs/nfs/client.c:51:0:
> >> fs/nfs/pnfs.h:384:1: error: expected identifier or ‘(’ before ‘{’ token
> >> fs/nfs/client.c: In function ‘nfs_server_set_fsinfo’:
> >> fs/nfs/client.c:939:8: error: ‘struct nfs_server’ has no member named
> >> ‘pnfs_blksize’
> >> fs/nfs/client.c: At top level:
> >> fs/nfs/pnfs.h:382:20: warning: ‘set_pnfs_layoutdriver’ used but never
> >> defined [enabled by default]
> >> make[2]: *** [fs/nfs/client.o] Error 1
> > 
> > Sigh. This should fix it...
> 
> Only the first one, there are two independent places it broke. You
> missed this bit:
> 
> fs/nfs/client.c:939:8: error: ‘struct nfs_server’ has no member named

How's this?

8<-------------------------------------------------------------------------------------- 
>From e01e56eb7013a11f3e09bd8a8562332777f9e100 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 31 Jul 2011 15:33:26 -0400
Subject: [PATCH v2] NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 ||
 !CONFIG_NFS_V4_1

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>
---
 fs/nfs/pnfs.h             |    2 +-
 include/linux/nfs_fs_sb.h |    2 +-
 2 files changed, 2 insertions(+), 2 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)
 {
 }
 
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 82fdfc7..b5479df 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -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 */
-- 
1.7.6


-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com