Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 831c2dc5 authored by Boaz Harrosh's avatar Boaz Harrosh
Browse files

ore: FIX breakage when MISC_FILESYSTEMS is not set 



As Reported by Randy Dunlap

When MISC_FILESYSTEMS is not enabled and NFS4.1 is:

fs/built-in.o: In function `objio_alloc_io_state':
objio_osd.c:(.text+0xcb525): undefined reference to `ore_get_rw_state'
fs/built-in.o: In function `_write_done':
objio_osd.c:(.text+0xcb58d): undefined reference to `ore_check_io'
fs/built-in.o: In function `_read_done':
...

When MISC_FILESYSTEMS, which is more of a GUI thing then anything else,
is not selected. exofs/Kconfig is never examined during Kconfig,
and it can not do it's magic stuff to automatically select everything
needed.

We must split exofs/Kconfig in two. The ore one is always included.
And the exofs one is left in it's old place in the menu.

[Needed for the 3.2.0 Kernel]
CC: Stable Tree <stable@kernel.org>
Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
parent 5f0a6e2d

fs/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ source "fs/exofs/Kconfig" 


endif # MISC_FILESYSTEMS



source "fs/exofs/Kconfig.ore"



menuconfig NETWORK_FILESYSTEMS

	bool "Network File Systems"

	default y

fs/exofs/Kconfig

+0 −11
Original line number Diff line number Diff line 
# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects

# for every ORE user we do it like this. Any user should add itself here

# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are

# selected here, and we default to "ON". So in effect it is like been

# selected by any of the users.

config ORE

	tristate

	depends on EXOFS_FS || PNFS_OBJLAYOUT

	select ASYNC_XOR

	default SCSI_OSD_ULD



config EXOFS_FS

	tristate "exofs: OSD based file system support"

	depends on SCSI_OSD_ULD

fs/exofs/Kconfig.ore

0 → 100644
+12 −0
Original line number Diff line number Diff line 
# ORE - Objects Raid Engine (libore.ko)

#

# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects

# for every ORE user we do it like this. Any user should add itself here

# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are

# selected here, and we default to "ON". So in effect it is like been

# selected by any of the users.

config ORE

	tristate

	depends on EXOFS_FS || PNFS_OBJLAYOUT

	select ASYNC_XOR

	default SCSI_OSD_ULD