From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759919AbYDDTr1 (ORCPT ); Fri, 4 Apr 2008 15:47:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757280AbYDDTrS (ORCPT ); Fri, 4 Apr 2008 15:47:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44478 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757234AbYDDTrR (ORCPT ); Fri, 4 Apr 2008 15:47:17 -0400 Date: Fri, 4 Apr 2008 12:47:16 -0700 From: Mark Fasheh To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML , joel.becker@oracle.com Subject: Re: linux-next: Tree for March 25 (ocfs2 build) Message-ID: <20080404194716.GM21261@wotan.suse.de> Reply-To: Mark Fasheh References: <20080325175224.3ee62b09.sfr@canb.auug.org.au> <20080325143902.e69b704b.randy.dunlap@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080325143902.e69b704b.randy.dunlap@oracle.com> Organization: SUSE Labs, Novell, Inc User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 25, 2008 at 02:39:02PM -0700, Randy Dunlap wrote: > ocfs2 link/build problem with > CONFIG_OCFS2_FS=y > CONFIG_OCFS2_FS_O2CB=m > > ERROR: "dlmunlock" [fs/ocfs2/ocfs2_stack_o2cb.ko] undefined! > ERROR: "dlm_setup_eviction_cb" [fs/ocfs2/ocfs2_stack_o2cb.ko] undefined! > ERROR: "dlm_register_eviction_cb" [fs/ocfs2/ocfs2_stack_o2cb.ko] undefined! > ERROR: "dlm_register_domain" [fs/ocfs2/ocfs2_stack_o2cb.ko] undefined! > ERROR: "dlm_unregister_domain" [fs/ocfs2/ocfs2_stack_o2cb.ko] undefined! > ERROR: "dlm_unregister_eviction_cb" [fs/ocfs2/ocfs2_stack_o2cb.ko] undefined! > ERROR: "dlmlock" [fs/ocfs2/ocfs2_stack_o2cb.ko] undefined! > ERROR: "dlm_print_one_lock" [fs/ocfs2/ocfs2_stack_o2cb.ko] undefined! > make[2]: *** [__modpost] Error 1 Ok, does this patch fix it for you? --Mark -- Mark Fasheh From: Mark Fasheh ocfs2: Only build ocfs2/dlm with the o2cb stack module fs/ocfs2/dlm/ocfs2_dlm.ko and fs/ocfs2/dlm/ocfs2_dlmfs.ko get built if CONFIG_FS_OCFS2 is specified. This isn't quite how it should happen any more - the "o2cb" dlm modules should only be built if CONFIG_FS_OCFS2_O2CB is set, so update the dlm Makefile accordingly. Signed-off-by: Mark Fasheh --- fs/ocfs2/dlm/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/ocfs2/dlm/Makefile b/fs/ocfs2/dlm/Makefile index ce3f7c2..1903613 100644 --- a/fs/ocfs2/dlm/Makefile +++ b/fs/ocfs2/dlm/Makefile @@ -1,6 +1,6 @@ EXTRA_CFLAGS += -Ifs/ocfs2 -obj-$(CONFIG_OCFS2_FS) += ocfs2_dlm.o ocfs2_dlmfs.o +obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o ocfs2_dlmfs.o ocfs2_dlm-objs := dlmdomain.o dlmdebug.o dlmthread.o dlmrecovery.o \ dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o dlmver.o -- 1.5.4.1