From patchwork Mon Feb 16 11:54:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5832171 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 060279F37F for ; Mon, 16 Feb 2015 11:54:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 22461201B9 for ; Mon, 16 Feb 2015 11:54:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F83C2012E for ; Mon, 16 Feb 2015 11:54:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755386AbbBPLyX (ORCPT ); Mon, 16 Feb 2015 06:54:23 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:59247 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755381AbbBPLyX (ORCPT ); Mon, 16 Feb 2015 06:54:23 -0500 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0MU9sv-1XwcQ13JPV-00QkMD; Mon, 16 Feb 2015 12:54:12 +0100 From: Arnd Bergmann To: linaro-kernel@lists.linaro.org Cc: Daniel Thompson , Christoph Hellwig , patches@linaro.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, "J. Bruce Fields" Subject: Re: [PATCH] nfsd: Fix v2-only build regression Date: Mon, 16 Feb 2015 12:54:11 +0100 Message-ID: <2435499.xPpCe4zRXk@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1424086563-25570-1-git-send-email-daniel.thompson@linaro.org> References: <1424086563-25570-1-git-send-email-daniel.thompson@linaro.org> MIME-Version: 1.0 X-Provags-ID: V03:K0:EL92YAAynKUZeRpXD9sWYc3HhudpFUm3EDpXqF3zwu8A1RBMPyi /uCHLsl5Y99jsDvoAtTvAoUFEfWsTKV13Sq/CKPRkS1UYN5XB83QgqIl6AvkF8a4kAqEYGl 9FvLy3652Qva/w5khIW8S9ubC4WT1P7aHxkg4Tz7InZYArmI8XQ2Rhxioj9I0duZPpYNVVY mcwAePoU4FtaY44oMIRYQ== X-UI-Out-Filterresults: notjunk:1; Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Monday 16 February 2015 11:36:03 Daniel Thompson wrote: > Currently if nfsd is configured as v2 only then the kernel fails to build. > This is a regression introduced by 9cf514ccfacb("nfsd: implement pNFS > operations"). It occurs because inline code from the xdr4.h header is > now included from generic nfsd code (via pnfs.h). > > This patch takes the simplest route and makes conditional the problematic > inline function. > > Note: I also tried extending the #ifdef CONFIG_NFSD_PNFS to cover almost > all of the pnfs.h header file. That works great too but feels more > invasive. However I can dust this off if that were preferable for > any reason. > I believe this was fixed last Friday in the patch below. Do you still see the problem on today's linux-next? Arnd commit 3cd9ac34d50121470859bc3fe7eddbd2d498f374 Author: J. Bruce Fields Date: Fri Feb 13 12:34:25 2015 -0500 nfsd4: fix v3-less build Includes of pnfs.h in export.c and fcntl.c also bring in xdr4.h, which won't build without CONFIG_NFSD_V3, breaking non-V3 builds. Ifdef-out most of pnfs.h in that case. Reported-by: Bas Peters Reported-by: Jim Davis Fixes: 9cf514ccfac "nfsd: implement pNFS operations" Signed-off-by: J. Bruce Fields --- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfsd/pnfs.h b/fs/nfsd/pnfs.h index fedb4d620a81..d4c4453674c6 100644 --- a/fs/nfsd/pnfs.h +++ b/fs/nfsd/pnfs.h @@ -1,6 +1,7 @@ #ifndef _FS_NFSD_PNFS_H #define _FS_NFSD_PNFS_H 1 +#ifdef CONFIG_NFSD_V4 #include #include @@ -50,6 +51,7 @@ __be32 nfsd4_return_client_layouts(struct svc_rqst *rqstp, int nfsd4_set_deviceid(struct nfsd4_deviceid *id, const struct svc_fh *fhp, u32 device_generation); struct nfsd4_deviceid_map *nfsd4_find_devid_map(int idx); +#endif /* CONFIG_NFSD_V4 */ #ifdef CONFIG_NFSD_PNFS void nfsd4_setup_layout_type(struct svc_export *exp); @@ -59,6 +61,9 @@ void nfsd4_return_all_file_layouts(struct nfs4_client *clp, int nfsd4_init_pnfs(void); void nfsd4_exit_pnfs(void); #else +struct nfs4_client; +struct nfs4_file; + static inline void nfsd4_setup_layout_type(struct svc_export *exp) { }