>From: Keith Owens <kaos@xxxxxxx>
>On Fri, 19 Apr 2002 10:36:52 +1000,
>matthew@xxxxxxxxxxxxxxxx wrote:
>> Not sure why you would want to - but I accidently selected DMAPI m instead o
>f n
>>and the resulting kernel would not link due to what appeared to be missing DM
>API
>>function calls.
>>
>> I guess some one should get into kbuild and remove the option to build it as
> a
>>module ?
>
>Dean, as currently coded XFS has unconditional calls to DMAPI. This
>means that when XFS is built in then DMAPI cannot be a module. The
>patch below enforces this rule but I am not going to check it in until
>you decide if the code is correct or not.
>
>If XFS built in with DMAPI in a module is desirable then forget this
>patch, the DMAPI code has to be changed to use a register function and
>XFS to make conditional calls to DMAPI via the registered data.
The idea was that if XFS was built-in, then DMAPI must be built-in; and if XFS
is a module, then DMAPI must be a module. I thought I had code in
fs/Config.in to enforce this, but I've just been through its history back to
the last time I touched it and I can't find a mod which does it any better
than what you see today.
I believe your change will limit DMAPI to [yn] if XFS is 'y', but does it
really limit DMAPI to [mn] if XFS is 'm'? (I don't have convenient access to
a build machine tonight.)
Dean
>===========================================================================
>Index: linux/fs/Config.in
>===========================================================================
>
>--- /usr/tmp/TmpDir.27777-0/linux/fs/Config.in_1.77 Fri Apr 19 11:58:11 200
>2
>+++ linux/fs/Config.in Fri Apr 19 11:50:22 2002
>@@ -100,8 +100,16 @@
> dep_mbool ' Enable XFS Realtime support' CONFIG_XFS_RT $CONFIG_XFS_FS
> dep_mbool ' Enable XFS Quota' CONFIG_XFS_QUOTA $CONFIG_XFS_FS
> if [ "$CONFIG_XFS_FS" != "n" ]; then
>+ # Current DMAPI code has calls from XFS to DMAPI. This requires that
>+ # DMAPI be built in if selected and XFS is built in. Valid combinations
>+ # XFS=n, DMAPI=n
>+ # XFS=y, DMAPI=[yn]
>+ # XFS=m, DMAPI=[mn]
> dep_tristate ' Enable XFS DMAPI' CONFIG_XFS_DMAPI $CONFIG_XFS_FS
> if [ "$CONFIG_XFS_DMAPI" != "n" ]; then
>+ if [ "$CONFIG_XFS_FS" = "y" ]; then
>+ define_tristate CONFIG_XFS_DMAPI y
>+ fi
> define_bool CONFIG_HAVE_XFS_DMAPI y
> fi
> fi
>
|