Merged in commits 3b4b45001b6d8412aad76a55347de42d30d694f7 487c312c96379e45648c782cee5b0d469cba80d0 5992173f13550d75659fec1d7e1f6e87895d560a
I fixed the patches so they handled Or's comments about the iscsi_if.h defines. Thanks. On 08/23/2013 02:04 PM, Eddie Wai wrote: > Version 5: > - Added fix for when the session is NULL before calling read_boot > > Version 4: > - Added transport switch 'use_boot_info' to enable the overriding of > the session's iface param with the boot_info or not. This is only > populated for iscsi_tcp and bnx2i so far. > > Version 3: > - Added support for ISCSI_LLD_ROOT support as well > - Removed the 'boot_initiator' param because its not useful > - Added the 'boot_root' param to hold the 'ibft' or 'iscsi_root'N name to > support non-ibft sessions > - Moved the boot_nic net param extraction out of the iscsi_sysfs_read_iface > routine because it can affect iscsiadm iface config printouts > > Version 2: > - Added boot_initiator to hold the ibft initiator name > - Added boot_targetN to hold the corresponding ibft target name > - Moved the boot_nic net param extraction to the iscsi_sysfs_read_iface > routine > - Added extra check before eluding to use the boot_nic info > > For the case when iscsid is invoked for the first time after pivot root > during iSCSI boot, the boot connection would fail to re-connect if the > ibft/iscsi_boot sysfs entry contains tagged vlan. > > The problem was caused by the lack of such info in the iscsi_session sysfs > for sync_session to inherit from. > > The enclosed patchset does the following: > 1. Extract and save the ibft->ethernetN name to the boot_context->boot_nic > 2. Pass the boot_nic info to be saved to the sessionN sysfs > 3. Extract the sessionN boot_nic sysfs info and retrieve the corresponding > net params > > This 'boot_nic' kernel session sysfs entry will only be present for ibft > boot. Corresponding kernel drivers will have to add the ISCSI_PARAM_BOOT_NIC > attribute to its attr_is_visible table. > > The last patch provides the fix for the unconditional overwrite of the > iface struct even after the ibft net info was already extracted. > > > Eddie Wai (3): > ISCSISTART: Saved ibft boot info to the session sysfs > ISCSID: Added the extraction of the session boot info > ISCSID: Added iface content override fix > > include/fw_context.h | 3 ++ > include/iscsi_if.h | 4 +++ > include/iscsi_proto.h | 1 + > usr/config.h | 3 ++ > usr/idbm.c | 6 +++++ > usr/initiator_common.c | 14 +++++++++++- > usr/iscsi_sysfs.c | 40 > ++++++++++++++++++++++++++++++++++++ > usr/iscsid.c | 8 ++---- > usr/transport.c | 2 + > usr/transport.h | 1 + > utils/fwparam_ibft/fwparam_sysfs.c | 8 +++++++ > 11 files changed, 84 insertions(+), 6 deletions(-) > > -- You received this message because you are subscribed to the Google Groups "open-iscsi" group. To unsubscribe from this group and stop receiving emails from it, send an email to open-iscsi+unsubscr...@googlegroups.com. To post to this group, send email to email@example.com. Visit this group at http://groups.google.com/group/open-iscsi. For more options, visit https://groups.google.com/groups/opt_out.