Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753532AbbBMRol (ORCPT ); Fri, 13 Feb 2015 12:44:41 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:54108 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753025AbbBMRoj (ORCPT ); Fri, 13 Feb 2015 12:44:39 -0500 Message-ID: <54DE3802.2000202@roeck-us.net> Date: Fri, 13 Feb 2015 09:44:34 -0800 From: Guenter Roeck User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: "J. Bruce Fields" CC: Bas Peters , hch@lst.de, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, jim.epost@gmail.com Subject: Re: [PATCH] fs: nfsd:xdr4.h: add missing conditional group CONFIG_NFSD_V3 References: <1423778953-28307-1-git-send-email-baspeters93@gmail.com> <20150212230201.GB17998@roeck-us.net> <20150213145121.GC6808@fieldses.org> <54DE2BE9.5030706@roeck-us.net> <20150213173348.GD6808@fieldses.org> In-Reply-To: <20150213173348.GD6808@fieldses.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A020205.54DE3807.027C,ss=1,re=0.001,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-CTCH-Score: 0.001 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: C_4847, X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 3 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 0 X-CTCH-SenderID-TotalConfirmed: 0 X-CTCH-SenderID-TotalBulk: 0 X-CTCH-SenderID-TotalVirus: 0 X-CTCH-SenderID-TotalRecipients: 0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: mailgid no entry from get_relayhosts_entry X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2161 Lines: 68 On 02/13/2015 09:33 AM, J. Bruce Fields wrote: >> Result is that every build with NFS configured but not NSFv3 is >> now broken. > > Fortunately a v2-only server would be pretty unusual these days. > > I don't know, maybe this? > I applied the patch below on top of current mainline and passed it to my build farm. I'll let you know how it goes. Guenter > --b. > > commit 535c381153631af3bc708a97e267a2a6a86ee030 > Author: J. Bruce Fields > Date: Fri Feb 13 12:27:39 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 > > diff --git a/fs/nfsd/pnfs.h b/fs/nfsd/pnfs.h > index fedb4d6..d4c4453 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) > { > } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/