logfs: clarify MTD dependency

Commit Message

Andrew Morton Jan. 13, 2016, 8:39 p.m. UTC

On Wed, 13 Jan 2016 14:25:55 +0100 Arnd Bergmann <[e-mail]> wrote:

> After a change to the way that composite modules work, we get
> a logfs build error:
> 
> fs/built-in.o: In function `logfs_mount':
> :(.text+0x139d34): undefined reference to `logfs_get_sb_mtd'
> fs/built-in.o: In function `logfs_get_sb_bdev':
> :(.text+0x13aa08): undefined reference to `logfs_get_sb_mtd'
> 
> This patch avoids the error by changing the dependencies of
> logfs in a way that we can no longer configure logfs as built-in
> when the MTD core is a loadable module, while leaving the
> dependency to require at least one of MTD or BLOCK to be
> enabled.
> 
> Another patch tried to work around the problem, but accidentally
> dropped the dependency on 'BLOCK || MTD', allowing the file
> system to be built if neither is selected.
> 
> Signed-off-by: Arnd Bergmann <[e-mail]>
> Fixes: cf4f21938e13 ("kbuild: Allow to specify composite modules with modname-m")
> Fixes: e6be296f680c ("logfs: fix logfs build errors and dependencies")

Randy's "logfs: fix logfs build errors and dependencies" is an
only-in-mm thing.  So it would make sense to combine the two patches
into a single one and to give that an appropriate changelog.

How does this look? (Primary author was chosen randomly)


From: Arnd Bergmann <[e-mail]>
Subject: logfs: fix logfs build errors and dependencies

Fix build errors that happen when CONFIG_LOGFS=y and CONFIG_MTD=m:

fs/built-in.o: In function `logfs_mount':
super.c:(.text+0x92a6f): undefined reference to `logfs_get_sb_mtd'
fs/built-in.o: In function `logfs_get_sb_bdev':
(.text+0x93530): undefined reference to `logfs_get_sb_mtd'

This patch avoids the error by changing the dependencies of
logfs in a way that we can no longer configure logfs as built-in
when the MTD core is a loadable module, while leaving the
dependency to require at least one of MTD or BLOCK to be
enabled.

Signed-off-by: Arnd Bergmann <[e-mail]>
Signed-off-by: Randy Dunlap <[e-mail]>
Cc: Michal Marek <[e-mail]>
Cc: Peter Chen <[e-mail]>
Cc: Randy Dunlap <[e-mail]>
Cc: Joern Engel <[e-mail]>
Cc: Prasad Joshi <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 fs/logfs/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Arnd Bergmann Jan. 13, 2016, 8:45 p.m. UTC | #1

On Wednesday 13 January 2016 12:39:18 Andrew Morton wrote:
> 
> Randy's "logfs: fix logfs build errors and dependencies" is an
> only-in-mm thing.  So it would make sense to combine the two patches
> into a single one and to give that an appropriate changelog.
> 
> How does this look? (Primary author was chosen randomly)
> 
> 
> From: Arnd Bergmann <[e-mail]>
> Subject: logfs: fix logfs build errors and dependencies
> 
> Fix build errors that happen when CONFIG_LOGFS=y and CONFIG_MTD=m:
> 
> fs/built-in.o: In function `logfs_mount':
> super.c:(.text+0x92a6f): undefined reference to `logfs_get_sb_mtd'
> fs/built-in.o: In function `logfs_get_sb_bdev':
> (.text+0x93530): undefined reference to `logfs_get_sb_mtd'
> 
> This patch avoids the error by changing the dependencies of
> logfs in a way that we can no longer configure logfs as built-in
> when the MTD core is a loadable module, while leaving the
> dependency to require at least one of MTD or BLOCK to be
> enabled.
> 
> Signed-off-by: Arnd Bergmann <[e-mail]>
> Signed-off-by: Randy Dunlap <[e-mail]>
> Cc: Michal Marek <[e-mail]>
> Cc: Peter Chen <[e-mail]>
> Cc: Randy Dunlap <[e-mail]>
> Cc: Joern Engel <[e-mail]>
> Cc: Prasad Joshi <[e-mail]>
> Signed-off-by: Andrew Morton <[e-mail]>
> 

Looks good, thanks!

	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Randy Dunlap Jan. 13, 2016, 9:31 p.m. UTC | #2

On 01/13/16 12:45, Arnd Bergmann wrote:
> On Wednesday 13 January 2016 12:39:18 Andrew Morton wrote:
>>
>> Randy's "logfs: fix logfs build errors and dependencies" is an
>> only-in-mm thing.  So it would make sense to combine the two patches
>> into a single one and to give that an appropriate changelog.
>>
>> How does this look? (Primary author was chosen randomly)
>>
>>
>> From: Arnd Bergmann <[e-mail]>
>> Subject: logfs: fix logfs build errors and dependencies
>>
>> Fix build errors that happen when CONFIG_LOGFS=y and CONFIG_MTD=m:
>>
>> fs/built-in.o: In function `logfs_mount':
>> super.c:(.text+0x92a6f): undefined reference to `logfs_get_sb_mtd'
>> fs/built-in.o: In function `logfs_get_sb_bdev':
>> (.text+0x93530): undefined reference to `logfs_get_sb_mtd'
>>
>> This patch avoids the error by changing the dependencies of
>> logfs in a way that we can no longer configure logfs as built-in
>> when the MTD core is a loadable module, while leaving the
>> dependency to require at least one of MTD or BLOCK to be
>> enabled.
>>
>> Signed-off-by: Arnd Bergmann <[e-mail]>
>> Signed-off-by: Randy Dunlap <[e-mail]>
>> Cc: Michal Marek <[e-mail]>
>> Cc: Peter Chen <[e-mail]>
>> Cc: Randy Dunlap <[e-mail]>
>> Cc: Joern Engel <[e-mail]>
>> Cc: Prasad Joshi <[e-mail]>
>> Signed-off-by: Andrew Morton <[e-mail]>
>>
> 
> Looks good, thanks!
> 
> 	Arnd
> 

Thanks also.

Patch

diff -puN fs/logfs/Kconfig~logfs-fix-logfs-build-errors-and-dependencies fs/logfs/Kconfig
--- a/fs/logfs/Kconfig~logfs-fix-logfs-build-errors-and-dependencies
+++ a/fs/logfs/Kconfig
@@ -1,6 +1,6 @@ 
 config LOGFS
 	tristate "LogFS file system"
-	depends on (MTD || BLOCK)
+	depends on MTD || (!MTD && BLOCK)
 	select ZLIB_INFLATE
 	select ZLIB_DEFLATE
 	select CRC32