target: Follow up core updates from AGrover and HCH (round 4)

[mirror_ubuntu-zesty-kernel.git] / drivers / target / tcm_fc / tfc_sess.c

diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index 7491e21cc6ae4c35629614b687a424ac2917d87a..fbcbb3d1d06b64f06742ced9d5073764678d0676 100644 (file)
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -198,13 +198,13 @@ static struct ft_sess *ft_sess_get(struct fc_lport *lport, u32 port_id)
                if (sess->port_id == port_id) {
                        kref_get(&sess->kref);
                        rcu_read_unlock();
-                       FT_SESS_DBG("port_id %x found %p\n", port_id, sess);
+                       pr_debug("port_id %x found %p\n", port_id, sess);
                        return sess;
                }
        }
 out:
        rcu_read_unlock();
-       FT_SESS_DBG("port_id %x not found\n", port_id);
+       pr_debug("port_id %x not found\n", port_id);
        return NULL;
 }
 
@@ -240,7 +240,7 @@ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id,
        hlist_add_head_rcu(&sess->hash, head);
        tport->sess_count++;
 
-       FT_SESS_DBG("port_id %x sess %p\n", port_id, sess);
+       pr_debug("port_id %x sess %p\n", port_id, sess);
 
        transport_register_session(&tport->tpg->se_tpg, &acl->se_node_acl,
                                   sess->se_sess, sess);
@@ -314,7 +314,7 @@ int ft_sess_shutdown(struct se_session *se_sess)
 {
        struct ft_sess *sess = se_sess->fabric_sess_ptr;
 
-       FT_SESS_DBG("port_id %x\n", sess->port_id);
+       pr_debug("port_id %x\n", sess->port_id);
        return 1;
 }
 
@@ -335,7 +335,7 @@ void ft_sess_close(struct se_session *se_sess)
                mutex_unlock(&ft_lport_lock);
                return;
        }
-       FT_SESS_DBG("port_id %x\n", port_id);
+       pr_debug("port_id %x\n", port_id);
        ft_sess_unhash(sess);
        mutex_unlock(&ft_lport_lock);
        transport_deregister_session_configfs(se_sess);
@@ -348,7 +348,7 @@ void ft_sess_stop(struct se_session *se_sess, int sess_sleep, int conn_sleep)
 {
        struct ft_sess *sess = se_sess->fabric_sess_ptr;
 
-       FT_SESS_DBG("port_id %x\n", sess->port_id);
+       pr_debug("port_id %x\n", sess->port_id);
 }
 
 int ft_sess_logged_in(struct se_session *se_sess)
@@ -458,7 +458,7 @@ static int ft_prli(struct fc_rport_priv *rdata, u32 spp_len,
        mutex_lock(&ft_lport_lock);
        ret = ft_prli_locked(rdata, spp_len, rspp, spp);
        mutex_unlock(&ft_lport_lock);
-       FT_SESS_DBG("port_id %x flags %x ret %x\n",
+       pr_debug("port_id %x flags %x ret %x\n",
               rdata->ids.port_id, rspp ? rspp->spp_flags : 0, ret);
        return ret;
 }
@@ -518,11 +518,11 @@ static void ft_recv(struct fc_lport *lport, struct fc_frame *fp)
        struct ft_sess *sess;
        u32 sid = fc_frame_sid(fp);
 
-       FT_SESS_DBG("sid %x\n", sid);
+       pr_debug("sid %x\n", sid);
 
        sess = ft_sess_get(lport, sid);
        if (!sess) {
-               FT_SESS_DBG("sid %x sess lookup failed\n", sid);
+               pr_debug("sid %x sess lookup failed\n", sid);
                /* TBD XXX - if FCP_CMND, send PRLO */
                fc_frame_free(fp);
                return;