Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx2.netapp.com ([216.240.18.37]:58156 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752101Ab2GaNaY (ORCPT ); Tue, 31 Jul 2012 09:30:24 -0400 Message-ID: <5017DDDB.6060500@netapp.com> Date: Tue, 31 Jul 2012 09:30:03 -0400 From: Bryan Schumaker MIME-Version: 1.0 To: "Myklebust, Trond" CC: "Schumaker, Bryan" , Fengguang Wu , "kernel-janitors@vger.kernel.org" , "linux-nfs@vger.kernel.org" Subject: Re: [nfs:devel 46/51] fs/nfs/write.c:1592:5: error: redefinition of 'nfs_commit_inode' References: <20120731024328.GA10480@localhost> <4FA345DA4F4AE44899BD2B03EEEC2FA934BE82@SACEXCMBX04-PRD.hq.netapp.com> <5017D3FC.9010905@netapp.com> <1343739299.519.1.camel@lade.trondhjem.org> <5017D824.209@netapp.com> In-Reply-To: <5017D824.209@netapp.com> Content-Type: text/plain; charset=UTF-8 Sender: linux-nfs-owner@vger.kernel.org List-ID: On 07/31/2012 09:05 AM, Bryan Schumaker wrote: > On 07/31/2012 08:55 AM, Myklebust, Trond wrote: >> On Tue, 2012-07-31 at 08:47 -0400, Bryan Schumaker wrote: >>> On 07/30/2012 11:14 PM, Myklebust, Trond wrote: >>>> Bryan, >>>> >>>> Why did you switch to using IS_ENABLED in the first place, and why wasn't that put in a separate patch? >>> >>> IS_ENABLED() will check for CONFIG_NFS_V*_MODULE, last I checked the defined() macro doesn't. Putting this into a separate patch makes the change non-bisectable since gcc will be checking against CONFIG_NFS_V3 but CONFIG_NFS_V3_MODULE is set. Should I have changed the CONFIG_ variables instead of using IS_ENABLED()? >> >> Why is it evaluating differently in the include file vs. the .c file? >> Are we missing an include in nfs_fs.h? > > Good question. I don't see any reason that it would evaluate differently, but I'm compiling the .config attached to the initial email to try to figure it out. > Looks like the IS_ENABLED() switch got pushed to the next patch for V3 in include/linux/nfs_fs.h. Want me to resend the patches? I took another look at how IS_ENABLED() is defined, and it'll work if I do the switch in the patch before I turn everything into separate modules if you want me to resend everything. > - Bryan > >> >>>> >>>> >>>> >>>>> -----Original Message----- >>>>> From: Fengguang Wu [mailto:fengguang.wu@intel.com] >>>>> Sent: Monday, July 30, 2012 10:43 PM >>>>> To: Schumaker, Bryan >>>>> Cc: kernel-janitors@vger.kernel.org; Myklebust, Trond; linux- >>>>> nfs@vger.kernel.org >>>>> Subject: [nfs:devel 46/51] fs/nfs/write.c:1592:5: error: redefinition of >>>>> 'nfs_commit_inode' >>>>> >>>>> Hi Bryan, >>>>> >>>>> Kernel build failed on >>>>> >>>>> tree: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git devel >>>>> head: 5c13c9e1c15ee2ca9ab2b953224001af53d9be09 >>>>> commit: 1c606fb74c758beafd98cbad9a9133eadeec2371 [46/51] NFS: Convert >>>>> v3 into a module >>>>> config: blackfin-BF533-EZKIT_defconfig (attached as .config) >>>>> >>>>> All related error/warning messages: >>>>> >>>>> fs/nfs/write.c:1592:5: error: redefinition of 'nfs_commit_inode' >>>>> In file included from fs/nfs/write.c:19:0: >>>>> include/linux/nfs_fs.h:547:1: note: previous definition of 'nfs_commit_inode' >>>>> was here >>>>> >>>>> vim +1592 fs/nfs/write.c >>>>> 1589 return status; >>>>> 1590 } >>>>> 1591 >>>>>> 1592 int nfs_commit_inode(struct inode *inode, int how) >>>>> 1593 { >>>>> 1594 LIST_HEAD(head); >>>>> 1595 struct nfs_commit_info cinfo; >>>>> >>>>> --- >>>>> 0-DAY kernel build testing backend Open Source Technology Centre >>>>> Fengguang Wu Intel Corporation >>> >> >