From patchwork Sun Jul 31 19:58:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 1024652 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6VJwwIm003466 for ; Sun, 31 Jul 2011 19:58:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752071Ab1GaT6r (ORCPT ); Sun, 31 Jul 2011 15:58:47 -0400 Received: from mx2.netapp.com ([216.240.18.37]:48245 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751894Ab1GaT6r convert rfc822-to-8bit (ORCPT ); Sun, 31 Jul 2011 15:58:47 -0400 X-IronPort-AV: E=Sophos;i="4.67,296,1309762800"; d="scan'208";a="566955202" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 31 Jul 2011 12:58:46 -0700 Received: from svlrsexc2-prd.hq.netapp.com (svlrsexc2-prd.hq.netapp.com [10.57.115.31]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p6VJwkrn011807; Sun, 31 Jul 2011 12:58:46 -0700 (PDT) Received: from SACMVEXC2-PRD.hq.netapp.com ([10.99.115.17]) by svlrsexc2-prd.hq.netapp.com with Microsoft SMTPSVC(6.0.3790.3959); Sun, 31 Jul 2011 12:58:46 -0700 Received: from 10.55.68.68 ([10.55.68.68]) by SACMVEXC2-PRD.hq.netapp.com ([10.99.115.16]) with Microsoft Exchange Server HTTP-DAV ; Sun, 31 Jul 2011 19:58:45 +0000 Received: from lade.trondhjem.org by SACMVEXC2-PRD.hq.netapp.com; 31 Jul 2011 15:58:45 -0400 Subject: Re: Please pull NFS client changes From: Trond Myklebust To: Jens Axboe Cc: Christoph Hellwig , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Date: Sun, 31 Jul 2011 15:58:45 -0400 In-Reply-To: <4E35B126.8050009@fusionio.com> 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> Organization: NetApp Inc X-Mailer: Evolution 3.0.2 (3.0.2-3.fc15) Message-ID: <1312142325.7127.3.camel@lade.trondhjem.org> Mime-Version: 1.0 X-OriginalArrivalTime: 31 Jul 2011 19:58:46.0432 (UTC) FILETIME=[41DC8A00:01CC4FBC] Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 31 Jul 2011 19:58:59 +0000 (UTC) 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 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 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) } 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 */