diff options
| author | Hannes Reinecke <hare@suse.de> | 2014-10-29 11:03:56 -0700 |
|---|---|---|
| committer | Mike Christie <michaelc@cs.wisc.edu> | 2014-11-14 14:12:01 -0600 |
| commit | a125761c7b306ebc3aa1df3539cd4052dcfd59ca (patch) | |
| tree | 5e6dfc3508787a4373d2b74f3f76cc07b0fd972d | |
| parent | 0fbf555da698880bc44ebf8106ee666d43fc92b7 (diff) | |
| download | open-iscsi-a125761c7b306ebc3aa1df3539cd4052dcfd59ca.tar.gz | |
Code cleanup: no functional changes
| -rw-r--r-- | usr/iface.c | 3 | ||||
| -rw-r--r-- | utils/fwparam_ibft/fw_entry.c | 8 | ||||
| -rw-r--r-- | utils/fwparam_ibft/fwparam_sysfs.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/usr/iface.c b/usr/iface.c index 870dba0..940ee23 100644 --- a/usr/iface.c +++ b/usr/iface.c @@ -1002,7 +1002,8 @@ int iface_setup_from_boot_context(struct iface_rec *iface, sizeof(iface->iname)); if (strlen(context->scsi_host_name)) { - if (sscanf(context->scsi_host_name, "iscsi_boot%u", &hostno) != 1) { + if (sscanf(context->scsi_host_name, + "iscsi_boot%u", &hostno) != 1) { log_error("Could not parse %s's host no.", context->scsi_host_name); return 0; diff --git a/utils/fwparam_ibft/fw_entry.c b/utils/fwparam_ibft/fw_entry.c index 295e905..9f0797f 100644 --- a/utils/fwparam_ibft/fw_entry.c +++ b/utils/fwparam_ibft/fw_entry.c @@ -67,15 +67,15 @@ int fw_setup_nics(void) * to force iSCSI traffic through correct NIC */ list_for_each_entry(context, &targets, list) { - /* if it is a offload nic ignore it */ - if (!net_get_transport_name_from_netdev(context->iface, + /* if it is a offload nic ignore it */ + if (!net_get_transport_name_from_netdev(context->iface, transport)) continue; if (iface_prev == NULL || strcmp(context->iface, iface_prev)) { /* Note: test above works because there is a - * maximum of two targets in the iBFT - */ + * maximum of two targets in the iBFT + */ iface_prev = context->iface; needs_bringup = 1; } diff --git a/utils/fwparam_ibft/fwparam_sysfs.c b/utils/fwparam_ibft/fwparam_sysfs.c index 09dd9fd..b531906 100644 --- a/utils/fwparam_ibft/fwparam_sysfs.c +++ b/utils/fwparam_ibft/fwparam_sysfs.c @@ -325,7 +325,7 @@ static int get_boot_info(struct boot_context *context, char *rootdir, nic_cnt = 0; tgt_cnt = 0; if (file_exist(initiator_dir)) { - /* Find the target's and the ethernet's */ + /* Find the targets and the ethernets */ rc = nftw(rootdir, find_sysfs_dirs, 20, 1); /* Find wihch target and which ethernet have @@ -401,7 +401,7 @@ static int get_targets(struct list_head *list, char *rootdir, char *subsys) nic_cnt = 0; tgt_cnt = 0; - /* Find the target's and the ethernet's */ + /* Find the targets and the ethernets */ nftw(rootdir, find_sysfs_dirs, 20, 1); for (i = 0; i < tgt_cnt; i++) { context = calloc(1, sizeof(*context)); |