[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Fri, 04 Apr 2008 12:56:52 -0700
From: Randy Dunlap <randy.dunlap@...cle.com>
To: Mark Fasheh <mfasheh@...e.com>
CC: Stephen Rothwell <sfr@...b.auug.org.au>,
linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
joel.becker@...cle.com
Subject: Re: linux-next: Tree for March 25 (ocfs2 build)
Mark Fasheh wrote:
> 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
Yes, thanks.
Acked-by: Randy Dunlap <randy.dunlap@...cle.com>
> --
> Mark Fasheh
>
>
> From: Mark Fasheh <mfasheh@...e.com>
>
> 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 <mfasheh@...e.com>
> ---
> 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
--
~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists