From mboxrd@z Thu Jan 1 00:00:00 1970 From: Trond Myklebust Subject: Re: Please pull NFS client changes Date: Sun, 31 Jul 2011 15:58:45 -0400 Message-ID: <1312142325.7127.3.camel@lade.trondhjem.org> References: <1312082377.10882.1.camel@lade.trondhjem.org> <20110731182406.GA16470@infradead.org> <4E35A9B1.9090309@fusionio.com> <1312141193.7127.1.camel@lade.trondhjem.org> <4E35B126.8050009@fusionio.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Christoph Hellwig , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org To: Jens Axboe Return-path: In-Reply-To: <4E35B126.8050009@fusionio.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org On Sun, 2011-07-31 at 21:46 +0200, Jens Axboe wrote:=20 > On 2011-07-31 21:39, Trond Myklebust wrote: > > On Sun, 2011-07-31 at 21:14 +0200, Jens Axboe wrote:=20 > >> On 2011-07-31 20:24, Christoph Hellwig wrote: > >>> How does this manage to include the pnfs block code, which only w= as 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 =E2=80=98(=E2=80= =99 before =E2=80=98{=E2=80=99 token > >> fs/nfs/client.c: In function =E2=80=98nfs_server_set_fsinfo=E2=80=99= : > >> fs/nfs/client.c:939:8: error: =E2=80=98struct nfs_server=E2=80=99 = has no member named > >> =E2=80=98pnfs_blksize=E2=80=99 > >> fs/nfs/client.c: At top level: > >> fs/nfs/pnfs.h:382:20: warning: =E2=80=98set_pnfs_layoutdriver=E2=80= =99 used but never > >> defined [enabled by default] > >> make[2]: *** [fs/nfs/client.o] Error 1 > >=20 > > Sigh. This should fix it... >=20 > Only the first one, there are two independent places it broke. You > missed this bit: >=20 > fs/nfs/client.c:939:8: error: =E2=80=98struct nfs_server=E2=80=99 has= no member named How's this? 8<---------------------------------------------------------------------= -----------------=20 =46rom e01e56eb7013a11f3e09bd8a8562332777f9e100 Mon Sep 17 00:00:00 200= 1 =46rom: Trond Myklebust 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 =46ix 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 Signed-off-by: Trond Myklebust --- 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) } =20 static inline void set_pnfs_layoutdriver(struct nfs_server *s, - const struct nfs_fh *mntfh, u32 id); + const struct nfs_fh *mntfh, u32 id) { } =20 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 =20 + 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 */ =20 /* the following fields are protected by nfs_client->cl_lock */ --=20 1.7.6 --=20 Trond Myklebust Linux NFS client maintainer NetApp Trond.Myklebust@netapp.com www.netapp.com