Re: linux-next: Tree for December 29 (fcoe/libfc)

Randy Dunlap
2008-12-30T16:54:49Z

James Bottomley wrote:
> On Mon, 2008-12-29 at 19:53 -0800, Randy Dunlap wrote:
>> On Tue, 30 Dec 2008 03:16:21 +1100 Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20081219:
>>>
>>> Undropped tree:
>>> scci
>>> mtd
>>>
>>> Dropped trees (temporarily):
>>> nfs (akpm request due to 2.6.30 features)
>>> kvm (build problem)
>>> rr (build poblem)
>>> semaphore-removal (due to unfixed conflicts against Linus' tree)
>>> cpu_alloc (build problem)
>>> audit (difficult conflicts)
>>>
>>> Linus' tree had three build failures requiring patches and one requiring
>>> a revert.
>>
>> >From drivers/scsi/Kconfig:
>>
>> config LIBFC
>> tristate "LibFC module"
>> depends on SCSI && SCSI_FC_ATTRS
>> ---help---
>> Fibre Channel library module
>>
>> config FCOE
>> tristate "FCoE module"
>> depends on SCSI
>> select LIBFC
>> ---help---
>> Fibre Channel over Ethernet module
>>
>>
>> Aside from being very skimpy help messages, nothing there requires
>> SCSI_FC_ATTRS to be enabled for FCOE, so when FCOE is enabled,
>> LIBFC is selected, and then bang:
>>
>> ERROR: "scsi_is_fc_rport" [drivers/scsi/libfc/libfc.ko] undefined!
>> ERROR: "fc_remote_port_delete" [drivers/scsi/libfc/libfc.ko] undefined!
>> ERROR: "fc_remote_port_add" [drivers/scsi/libfc/libfc.ko] undefined!
>> ERROR: "fc_release_transport" [drivers/scsi/fcoe/fcoe.ko] undefined!
>> ERROR: "fc_remove_host" [drivers/scsi/fcoe/fcoe.ko] undefined!
>> ERROR: "fc_attach_transport" [drivers/scsi/fcoe/fcoe.ko] undefined!
>
> I checked the select of an option that selects, it seems to work nicely,
> so I think this is the fix. The custom has been to select the
> attributes rather than depend on them anyway. There's also no need to
> depend on SCSI since the whole thing is enclosed in an if SCSI_LOWLEVEL
> && SCSI.
>
> James
>
> ---
>
>
> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
> index 0e5e084..9f4cc8e 100644
> --- a/drivers/scsi/Kconfig
> +++ b/drivers/scsi/Kconfig
> @@ -607,13 +607,12 @@ config SCSI_FLASHPOINT
>
> config LIBFC
> tristate "LibFC module"
> - depends on SCSI && SCSI_FC_ATTRS
> + select SCSI_FC_ATTRS
> ---help---
> Fibre Channel library module
>
> config FCOE
> tristate "FCoE module"
> - depends on SCSI
> select LIBFC
> ---help---
> Fibre Channel over Ethernet module
>
>

This still has a build error when CONFIG_PCI=n:

linux-next-20081229/drivers/scsi/fcoe/fc_transport_fcoe.c: In function 'fcoe_load_transport_driver':
linux-next-20081229/drivers/scsi/fcoe/fc_transport_fcoe.c:324: error: 'pci_bus_type' undeclared (first use in this function)
make[4]: *** [drivers/scsi/fcoe/fc_transport_fcoe.o] Error 1

--
~Randy