lkml.org 
[lkml]   [2012]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[22/49] ore: FIX breakage when MISC_FILESYSTEMS is not set
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Boaz Harrosh <bharrosh@panasas.com>

    commit 831c2dc5f47c1dc79c32229d75065ada1dcc66e1 upstream.

    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.

    Reported-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/Kconfig | 2 ++
    fs/exofs/Kconfig | 11 -----------
    fs/exofs/Kconfig.ore | 12 ++++++++++++
    3 files changed, 14 insertions(+), 11 deletions(-)

    --- a/fs/Kconfig
    +++ b/fs/Kconfig
    @@ -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
    --- a/fs/exofs/Kconfig
    +++ b/fs/exofs/Kconfig
    @@ -1,14 +1,3 @@
    -# 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
    --- /dev/null
    +++ b/fs/exofs/Kconfig.ore
    @@ -0,0 +1,12 @@
    +# 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



    \
     
     \ /
      Last update: 2012-01-11 00:07    [W:4.747 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site