4 files changed, 29 insertions, 32 deletions

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 495456fe4520..0b5fbb8940c4 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -928,8 +928,9 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
                                        struct device *parent, int npiv)
 {
         struct net_device *netdev = fcoe->netdev;
-        struct fc_lport *lport = NULL;
+        struct fc_lport *lport, *n_port;
         struct fcoe_port *port;
+        struct Scsi_Host *shost;
         int rc;
         /*
          * parent is only a vport if npiv is 1,
@@ -939,13 +940,11 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
 
         FCOE_NETDEV_DBG(netdev, "Create Interface\n");
 
-        if (!npiv) {
-                lport = libfc_host_alloc(&fcoe_shost_template,
-                                         sizeof(struct fcoe_port));
-        } else  {
-                lport = libfc_vport_create(vport,
-                                           sizeof(struct fcoe_port));
-        }
+        if (!npiv)
+                lport = libfc_host_alloc(&fcoe_shost_template, sizeof(*port));
+        else
+                lport = libfc_vport_create(vport, sizeof(*port));
+
         if (!lport) {
                 FCOE_NETDEV_DBG(netdev, "Could not allocate host structure\n");
                 rc = -ENOMEM;
@@ -998,24 +997,27 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
                 goto out_lp_destroy;
         }
 
-        if (!npiv) {
-                /*
-                 * fcoe_em_alloc() and fcoe_hostlist_add() both
-                 * need to be atomic with respect to other changes to the
-                 * hostlist since fcoe_em_alloc() looks for an existing EM
-                 * instance on host list updated by fcoe_hostlist_add().
-                 *
-                 * This is currently handled through the fcoe_config_mutex
-                 * begin held.
-                 */
-
+        /*
+         * fcoe_em_alloc() and fcoe_hostlist_add() both
+         * need to be atomic with respect to other changes to the
+         * hostlist since fcoe_em_alloc() looks for an existing EM
+         * instance on host list updated by fcoe_hostlist_add().
+         *
+         * This is currently handled through the fcoe_config_mutex
+         * begin held.
+         */
+        if (!npiv)
                 /* lport exch manager allocation */
                 rc = fcoe_em_config(lport);
-                if (rc) {
-                        FCOE_NETDEV_DBG(netdev, "Could not configure the EM "
-                                        "for the interface\n");
-                        goto out_lp_destroy;
-                }
+        else {
+                shost = vport_to_shost(vport);
+                n_port = shost_priv(shost);
+                rc = fc_exch_mgr_list_clone(n_port, lport);
+        }
+
+        if (rc) {
+                FCOE_NETDEV_DBG(netdev, "Could not configure the EM\n");
+                goto out_lp_destroy;
         }
 
         fcoe_interface_get(fcoe);
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 10a5436aff77..28231badd9e6 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -2175,6 +2175,7 @@ err:
                 fc_exch_mgr_del(ema);
         return -ENOMEM;
 }
+EXPORT_SYMBOL(fc_exch_mgr_list_clone);
 
 /**
  * fc_exch_mgr_alloc() - Allocate an exchange manager
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 735f1f82ccfd..8c08b210001d 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -1590,6 +1590,7 @@ void fc_lport_enter_flogi(struct fc_lport *lport)
  */
 int fc_lport_config(struct fc_lport *lport)
 {
+        INIT_LIST_HEAD(&lport->ema_list);
         INIT_DELAYED_WORK(&lport->retry_work, fc_lport_timeout);
         mutex_init(&lport->lp_mutex);
 
diff --git a/drivers/scsi/libfc/fc_npiv.c b/drivers/scsi/libfc/fc_npiv.c
index 076cd5ff0e40..f33b897e4784 100644
--- a/drivers/scsi/libfc/fc_npiv.c
+++ b/drivers/scsi/libfc/fc_npiv.c
@@ -37,9 +37,7 @@ struct fc_lport *libfc_vport_create(struct fc_vport *vport, int privsize)
 
         vn_port = libfc_host_alloc(shost->hostt, privsize);
         if (!vn_port)
-                goto err_out;
-        if (fc_exch_mgr_list_clone(n_port, vn_port))
-                goto err_put;
+                return vn_port;
 
         vn_port->vport = vport;
         vport->dd_data = vn_port;
@@ -49,11 +47,6 @@ struct fc_lport *libfc_vport_create(struct fc_vport *vport, int privsize)
         mutex_unlock(&n_port->lp_mutex);
 
         return vn_port;
-
-err_put:
-        scsi_host_put(vn_port->host);
-err_out:
-        return NULL;
 }
 EXPORT_SYMBOL(libfc_vport_create);