3 files changed, 35 insertions, 64 deletions

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 8a44d1541eb4..ca39deb4ff5b 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -637,8 +637,10 @@ static void qlt_free_session_done(struct work_struct *work)
 }
 
 /* ha->tgt.sess_lock supposed to be held on entry */
-void qlt_unreg_sess(struct qla_tgt_sess *sess)
+static void qlt_release_session(struct kref *kref)
 {
+        struct qla_tgt_sess *sess =
+                container_of(kref, struct qla_tgt_sess, sess_kref);
         struct scsi_qla_host *vha = sess->vha;
 
         if (sess->se_sess)
@@ -651,8 +653,16 @@ void qlt_unreg_sess(struct qla_tgt_sess *sess)
         INIT_WORK(&sess->free_work, qlt_free_session_done);
         schedule_work(&sess->free_work);
 }
-EXPORT_SYMBOL(qlt_unreg_sess);
 
+void qlt_put_sess(struct qla_tgt_sess *sess)
+{
+        if (!sess)
+                return;
+
+        assert_spin_locked(&sess->vha->hw->tgt.sess_lock);
+        kref_put(&sess->sess_kref, qlt_release_session);
+}
+EXPORT_SYMBOL(qlt_put_sess);
 
 static int qlt_reset(struct scsi_qla_host *vha, void *iocb, int mcmd)
 {
@@ -857,12 +867,9 @@ static void qlt_del_sess_work_fn(struct delayed_work *work)
                         ql_dbg(ql_dbg_tgt_mgt, vha, 0xf004,
                             "Timeout: sess %p about to be deleted\n",
                             sess);
-                        if (sess->se_sess) {
+                        if (sess->se_sess)
                                 ha->tgt.tgt_ops->shutdown_sess(sess);
-                                ha->tgt.tgt_ops->put_sess(sess);
-                        } else {
-                                qlt_unreg_sess(sess);
-                        }
+                        qlt_put_sess(sess);
                 } else {
                         schedule_delayed_work(&tgt->sess_del_work,
                             sess->expires - elapsed);
@@ -917,7 +924,7 @@ static struct qla_tgt_sess *qlt_create_sess(
                                 }
                         }
 
-                        kref_get(&sess->se_sess->sess_kref);
+                        kref_get(&sess->sess_kref);
                         ha->tgt.tgt_ops->update_sess(sess, fcport->d_id, fcport->loop_id,
                                                 (fcport->flags & FCF_CONF_COMP_SUPPORTED));
 
@@ -947,6 +954,7 @@ static struct qla_tgt_sess *qlt_create_sess(
         sess->s_id = fcport->d_id;
         sess->loop_id = fcport->loop_id;
         sess->local = local;
+        kref_init(&sess->sess_kref);
         INIT_LIST_HEAD(&sess->del_list_entry);
 
         /* Under normal circumstances we want to logout from firmware when
@@ -991,7 +999,7 @@ static struct qla_tgt_sess *qlt_create_sess(
                  * Take an extra reference to ->sess_kref here to handle qla_tgt_sess
                  * access across ->tgt.sess_lock reaquire.
                  */
-                kref_get(&sess->se_sess->sess_kref);
+                kref_get(&sess->sess_kref);
         }
 
         return sess;
@@ -1035,7 +1043,7 @@ void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport)
                 spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
                 return;
         } else {
-                kref_get(&sess->se_sess->sess_kref);
+                kref_get(&sess->sess_kref);
 
                 if (sess->deleted) {
                         qlt_undelete_sess(sess);
@@ -1060,7 +1068,7 @@ void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport)
                     fcport->port_name, sess->loop_id);
                 sess->local = 0;
         }
-        ha->tgt.tgt_ops->put_sess(sess);
+        qlt_put_sess(sess);
         spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
 }
 
@@ -3817,7 +3825,7 @@ static void __qlt_do_work(struct qla_tgt_cmd *cmd)
          * Drop extra session reference from qla_tgt_handle_cmd_for_atio*(
          */
         spin_lock_irqsave(&ha->tgt.sess_lock, flags);
-        ha->tgt.tgt_ops->put_sess(sess);
+        qlt_put_sess(sess);
         spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
         return;
 
@@ -3836,7 +3844,7 @@ out_term:
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         spin_lock_irqsave(&ha->tgt.sess_lock, flags);
-        ha->tgt.tgt_ops->put_sess(sess);
+        qlt_put_sess(sess);
         spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
 }
 
@@ -3936,13 +3944,13 @@ static void qlt_create_sess_from_atio(struct work_struct *work)
         if (!cmd) {
                 spin_lock_irqsave(&ha->hardware_lock, flags);
                 qlt_send_busy(vha, &op->atio, SAM_STAT_BUSY);
-                ha->tgt.tgt_ops->put_sess(sess);
+                qlt_put_sess(sess);
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
                 kfree(op);
                 return;
         }
         /*
-         * __qlt_do_work() will call ha->tgt.tgt_ops->put_sess() to release
+         * __qlt_do_work() will call qlt_put_sess() to release
          * the extra reference taken above by qlt_make_local_sess()
          */
         __qlt_do_work(cmd);
@@ -4003,13 +4011,13 @@ static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha,
         /*
          * Do kref_get() before returning + dropping qla_hw_data->hardware_lock.
          */
-        kref_get(&sess->se_sess->sess_kref);
+        kref_get(&sess->sess_kref);
 
         cmd = qlt_get_tag(vha, sess, atio);
         if (!cmd) {
                 ql_dbg(ql_dbg_io, vha, 0x3062,
                     "qla_target(%d): Allocation of cmd failed\n", vha->vp_idx);
-                ha->tgt.tgt_ops->put_sess(sess);
+                qlt_put_sess(sess);
                 return -ENOMEM;
         }
 
@@ -5911,7 +5919,7 @@ static void qlt_abort_work(struct qla_tgt *tgt,
                         goto out_term2;
                 }
 
-                kref_get(&sess->se_sess->sess_kref);
+                kref_get(&sess->sess_kref);
         }
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -5924,7 +5932,7 @@ static void qlt_abort_work(struct qla_tgt *tgt,
                 goto out_term;
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-        ha->tgt.tgt_ops->put_sess(sess);
+        qlt_put_sess(sess);
         spin_unlock_irqrestore(&ha->tgt.sess_lock, flags2);
         return;
 
@@ -5935,8 +5943,7 @@ out_term:
         qlt_24xx_send_abts_resp(vha, &prm->abts, FCP_TMF_REJECTED, false);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-        if (sess)
-                ha->tgt.tgt_ops->put_sess(sess);
+        qlt_put_sess(sess);
         spin_unlock_irqrestore(&ha->tgt.sess_lock, flags2);
 }
 
@@ -5976,7 +5983,7 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
                         goto out_term;
                 }
 
-                kref_get(&sess->se_sess->sess_kref);
+                kref_get(&sess->sess_kref);
         }
 
         iocb = a;
@@ -5988,14 +5995,13 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
         if (rc != 0)
                 goto out_term;
 
-        ha->tgt.tgt_ops->put_sess(sess);
+        qlt_put_sess(sess);
         spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
         return;
 
 out_term:
         qlt_send_term_exchange(vha, NULL, &prm->tm_iocb2, 1, 0);
-        if (sess)
-                ha->tgt.tgt_ops->put_sess(sess);
+        qlt_put_sess(sess);
         spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
 }
 
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index d857feeb6514..f26c5f60eedd 100644
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -738,7 +738,6 @@ struct qla_tgt_func_tmpl {
         struct qla_tgt_sess *(*find_sess_by_s_id)(struct scsi_qla_host *,
                                                 const uint8_t *);
         void (*clear_nacl_from_fcport_map)(struct qla_tgt_sess *);
-        void (*put_sess)(struct qla_tgt_sess *);
         void (*shutdown_sess)(struct qla_tgt_sess *);
 };
 
@@ -930,6 +929,7 @@ struct qla_tgt_sess {
         int generation;
 
         struct se_session *se_sess;
+        struct kref sess_kref;
         struct scsi_qla_host *vha;
         struct qla_tgt *tgt;
 
@@ -1101,7 +1101,7 @@ extern int qlt_remove_target(struct qla_hw_data *, struct scsi_qla_host *);
 extern int qlt_lport_register(void *, u64, u64, u64,
                         int (*callback)(struct scsi_qla_host *, void *, u64, u64));
 extern void qlt_lport_deregister(struct scsi_qla_host *);
-extern void qlt_unreg_sess(struct qla_tgt_sess *);
+void qlt_put_sess(struct qla_tgt_sess *sess);
 extern void qlt_fc_port_added(struct scsi_qla_host *, fc_port_t *);
 extern void qlt_fc_port_deleted(struct scsi_qla_host *, fc_port_t *, int);
 extern int __init qlt_init(void);
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index c1461d225f08..675f75bafc3c 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -339,22 +339,6 @@ static void tcm_qla2xxx_release_cmd(struct se_cmd *se_cmd)
         qlt_free_cmd(cmd);
 }
 
-static int tcm_qla2xxx_shutdown_session(struct se_session *se_sess)
-{
-        struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
-        struct scsi_qla_host *vha;
-        unsigned long flags;
-
-        BUG_ON(!sess);
-        vha = sess->vha;
-
-        spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
-        target_sess_cmd_list_set_waiting(se_sess);
-        spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags);
-
-        return 1;
-}
-
 static void tcm_qla2xxx_close_session(struct se_session *se_sess)
 {
         struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
@@ -365,7 +349,8 @@ static void tcm_qla2xxx_close_session(struct se_session *se_sess)
         vha = sess->vha;
 
         spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
-        qlt_unreg_sess(sess);
+        target_sess_cmd_list_set_waiting(se_sess);
+        qlt_put_sess(sess);
         spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags);
 }
 
@@ -758,23 +743,6 @@ static void tcm_qla2xxx_clear_nacl_from_fcport_map(struct qla_tgt_sess *sess)
         tcm_qla2xxx_clear_sess_lookup(lport, nacl, sess);
 }
 
-static void tcm_qla2xxx_release_session(struct kref *kref)
-{
-        struct se_session *se_sess = container_of(kref,
-                        struct se_session, sess_kref);
-
-        qlt_unreg_sess(se_sess->fabric_sess_ptr);
-}
-
-static void tcm_qla2xxx_put_sess(struct qla_tgt_sess *sess)
-{
-        if (!sess)
-                return;
-
-        assert_spin_locked(&sess->vha->hw->tgt.sess_lock);
-        kref_put(&sess->se_sess->sess_kref, tcm_qla2xxx_release_session);
-}
-
 static void tcm_qla2xxx_shutdown_sess(struct qla_tgt_sess *sess)
 {
         assert_spin_locked(&sess->vha->hw->tgt.sess_lock);
@@ -1579,7 +1547,6 @@ static struct qla_tgt_func_tmpl tcm_qla2xxx_template = {
         .find_sess_by_s_id      = tcm_qla2xxx_find_sess_by_s_id,
         .find_sess_by_loop_id   = tcm_qla2xxx_find_sess_by_loop_id,
         .clear_nacl_from_fcport_map = tcm_qla2xxx_clear_nacl_from_fcport_map,
-        .put_sess               = tcm_qla2xxx_put_sess,
         .shutdown_sess          = tcm_qla2xxx_shutdown_sess,
 };
 
@@ -1847,7 +1814,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_ops = {
         .tpg_get_inst_index             = tcm_qla2xxx_tpg_get_inst_index,
         .check_stop_free                = tcm_qla2xxx_check_stop_free,
         .release_cmd                    = tcm_qla2xxx_release_cmd,
-        .shutdown_session               = tcm_qla2xxx_shutdown_session,
         .close_session                  = tcm_qla2xxx_close_session,
         .sess_get_index                 = tcm_qla2xxx_sess_get_index,
         .sess_get_initiator_sid         = NULL,
@@ -1890,7 +1856,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
         .tpg_get_inst_index             = tcm_qla2xxx_tpg_get_inst_index,
         .check_stop_free                = tcm_qla2xxx_check_stop_free,
         .release_cmd                    = tcm_qla2xxx_release_cmd,
-        .shutdown_session               = tcm_qla2xxx_shutdown_session,
         .close_session                  = tcm_qla2xxx_close_session,
         .sess_get_index                 = tcm_qla2xxx_sess_get_index,
         .sess_get_initiator_sid         = NULL,