From patchwork Sun Jul 31 19:39:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 1024582 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 p6VJeKEK027130 for ; Sun, 31 Jul 2011 19:40:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751758Ab1GaTj4 (ORCPT ); Sun, 31 Jul 2011 15:39:56 -0400 Received: from mx2.netapp.com ([216.240.18.37]:18027 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750940Ab1GaTjz convert rfc822-to-8bit (ORCPT ); Sun, 31 Jul 2011 15:39:55 -0400 X-IronPort-AV: E=Sophos;i="4.67,296,1309762800"; d="scan'208";a="566954115" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 31 Jul 2011 12:39:54 -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 p6VJdsWC007296; Sun, 31 Jul 2011 12:39:54 -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:39:54 -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:39:53 +0000 Received: from lade.trondhjem.org by SACMVEXC2-PRD.hq.netapp.com; 31 Jul 2011 15:39:53 -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:39:53 -0400 In-Reply-To: <4E35A9B1.9090309@fusionio.com> References: <1312082377.10882.1.camel@lade.trondhjem.org> <20110731182406.GA16470@infradead.org> <4E35A9B1.9090309@fusionio.com> Organization: NetApp Inc X-Mailer: Evolution 3.0.2 (3.0.2-3.fc15) Message-ID: <1312141193.7127.1.camel@lade.trondhjem.org> Mime-Version: 1.0 X-OriginalArrivalTime: 31 Jul 2011 19:39:54.0612 (UTC) FILETIME=[9F3E8340:01CC4FB9] 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:40:20 +0000 (UTC) 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... 8<------------------------------------------------------------------------------------- From b74e1d98b2027aa3ec46f3612143d0d35db92cf5 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Sun, 31 Jul 2011 15:33:26 -0400 Subject: [PATCH] NFS: Fix a typo in fs/nfs/pnfs.h Reported-by: Jens Axboe Signed-off-by: Trond Myklebust --- fs/nfs/pnfs.h | 2 +- 1 files changed, 1 insertions(+), 1 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) { }