[PATCH] Fix 2.5-bk build error

[jhf@rivenstone.net (Joseph Fannin)]

[-- Attachment #1: Type: text/plain, Size: 1960 bytes --]

On Fri, Nov 01, 2002 at 12:56:20PM +0100, Roman Zippel wrote:
> On Thu, 31 Oct 2002, Joseph Fannin wrote:
> 
> > > # Meta block cache for Extended Attributes (ext2/ext3)
> > > config FS_MBCACHE
> > >        tristate
> > >        depends on EXT2_FS_XATTR || EXT3_FS_XATTR
> > >        default m if EXT2_FS=m || EXT3_FS=m
> > >        default y if EXT2_FS=y || EXT3_FS=y
> > 
> >     "If multiple default statements are visible only the first is
> > used."
> > 
> >     So the two default lines above need to be reversed.  This seems
> > backwards to me (the last should be used), but I've said enough.
> 
> Well, I had to pick something and using the first is easier to implement, 
> it's just different to cml1, which used the last definition.
> BTW xconfig is a nice way to see how the config back end works, you can 
> enable "Show All Options" and above entry will also be visible and you can 
> watch how the value changes depending on the inputs.
> BTW2 in the future above can be simplified into
> 
> config FS_MBCACHE
> 	tristate
> 	depends on EXT2_FS_XATTR || EXT3_FS_XATTR
> 	default EXT2_FS || EXT3_FS
> 

    Okay, here's a patch that does that.  Linus, this fixes a build
error in your current -bk tree that happens when one of ext[23] is a
module and the other is built-in.  Please apply it.



diff -urN linux-2.5.45/fs/Kconfig linux/fs/Kconfig
--- linux-2.5.45/fs/Kconfig	2002-11-01 11:42:04.000000000 -0500
+++ linux/fs/Kconfig	2002-11-01 11:59:50.000000000 -0500
@@ -1457,8 +1457,7 @@
 config FS_MBCACHE
 	tristate
 	depends on EXT2_FS_XATTR || EXT3_FS_XATTR
-	default m if EXT2_FS=m || EXT3_FS=m
-	default y if EXT2_FS=y || EXT3_FS=y
+	default EXT2_FS || EXT3_FS
 
 # Posix ACL utility routines (for now, only ext2/ext3)
 config FS_POSIX_ACL

-- 
Joseph Fannin
jhf@rivenstone.net

"Bull in pure form is rare; there is usually some contamination by data."
    -- William Graves Perry Jr.

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]