Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758823AbYHNJQy (ORCPT ); Thu, 14 Aug 2008 05:16:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754915AbYHNJQo (ORCPT ); Thu, 14 Aug 2008 05:16:44 -0400 Received: from mail.free-electrons.com ([88.191.46.45]:57672 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754644AbYHNJQn (ORCPT ); Thu, 14 Aug 2008 05:16:43 -0400 Date: Thu, 14 Aug 2008 11:16:33 +0200 From: Thomas Petazzoni To: "J. Bruce Fields" Cc: Randy Dunlap , Stephen Rothwell , neilb@suse.de, linux-next@vger.kernel.org, LKML Subject: Re: linux-next: Tree for August 13 (nfsd) Message-ID: <20080814111633.55f5f1e8@surf> In-Reply-To: <20080813180931.GC26765@fieldses.org> References: <20080813172452.14b0775c.sfr@canb.auug.org.au> <20080813104748.13848196.randy.dunlap@oracle.com> <20080813180931.GC26765@fieldses.org> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.9; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1569 Lines: 48 Le Wed, 13 Aug 2008 14:09:31 -0400, "J. Bruce Fields" a écrit : > Looks like that's just two more functions that need to be stubbed out > in the case where CONFIG_FILE_LOCKING is undefined?--hopefully Thomas > Petazzoni (cc'd) could be talked into reproducing this and sending me > an incremental fix.... Here is an incremental fix. --- Fixup configure out fs locks support This patch adds a few more stubs required to get NFS server to compile properly with CONFIG_FILE_LOCKING=n. Signed-off-by: Thomas Petazzoni --- include/linux/fs.h | 2 ++ 1 file changed, 2 insertions(+) Index: linuxdev/include/linux/fs.h =================================================================== --- linuxdev.orig/include/linux/fs.h +++ linuxdev/include/linux/fs.h @@ -1050,6 +1050,8 @@ #define __break_lease(a, b) ({ 0; }) #define lease_get_mtime(a, b) ({ }) #define generic_setlease(a, b, c) ({ -EINVAL; }) +#define vfs_setlease(a, b, c) ({ -EINVAL; }) +#define lease_modify(a, b) ({ -EINVAL; }) #define lock_may_read(a, b, c) ({ 1; }) #define lock_may_write(a, b, c) ({ 1; }) #endif /* !CONFIG_FILE_LOCKING */ -- Thomas Petazzoni, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com -- 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/