Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull SCSI target updates from Nicholas Bellinger:
 "It's been a busy development cycle for target-core in a number of
  different areas.

  The fabric API usage for se_node_acl allocation is now within
  target-core code, dropping the external API callers for all fabric
  drivers tree-wide.

  There is a new conversion to RCU hlists for se_node_acl and
  se_portal_group LUN mappings, that turns fast-past LUN lookup into a
  completely lockless code-path.  It also removes the original
  hard-coded limitation of 256 LUNs per fabric endpoint.

  The configfs attributes for backends can now be shared between core
  and driver code, allowing existing drivers to use common code while
  still allowing flexibility for new backend provided attributes.

  The highlights include:

   - Merge sbc_verify_dif_* into common code (sagi)
   - Remove iscsi-target support for obsolete IFMarker/OFMarker
     (Christophe Vu-Brugier)
   - Add bidi support in target/user backend (ilias + vangelis + agover)
   - Move se_node_acl allocation into target-core code (hch)
   - Add crc_t10dif_update common helper (akinobu + mkp)
   - Handle target-core odd SGL mapping for data transfer memory
     (akinobu)
   - Move transport ID handling into target-core (hch)
   - Move task tag into struct se_cmd + support 64-bit tags (bart)
   - Convert se_node_acl->device_list[] to RCU hlist (nab + hch +
     paulmck)
   - Convert se_portal_group->tpg_lun_list[] to RCU hlist (nab + hch +
     paulmck)
   - Simplify target backend driver registration (hch)
   - Consolidate + simplify target backend attribute implementations
     (hch + nab)
   - Subsume se_port + t10_alua_tg_pt_gp_member into se_lun (hch)
   - Drop lun_sep_lock for se_lun->lun_se_dev RCU usage (hch + nab)
   - Drop unnecessary core_tpg_register TFO parameter (nab)
   - Use 64-bit LUNs tree-wide (hannes)
   - Drop left-over TARGET_MAX_LUNS_PER_TRANSPORT limit (hannes)"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (76 commits)
  target: Bump core version to v5.0
  target: remove target_core_configfs.h
  target: remove unused TARGET_CORE_CONFIG_ROOT define
  target: consolidate version defines
  target: implement WRITE_SAME with UNMAP bit using ->execute_unmap
  target: simplify UNMAP handling
  target: replace se_cmd->execute_rw with a protocol_data field
  target/user: Fix inconsistent kmap_atomic/kunmap_atomic
  target: Send UA when changing LUN inventory
  target: Send UA upon LUN RESET tmr completion
  target: Send UA on ALUA target port group change
  target: Convert se_lun->lun_deve_lock to normal spinlock
  target: use 'se_dev_entry' when allocating UAs
  target: Remove 'ua_nacl' pointer from se_ua structure
  target_core_alua: Correct UA handling when switching states
  xen-scsiback: Fix compile warning for 64-bit LUN
  target: Remove TARGET_MAX_LUNS_PER_TRANSPORT
  target: use 64-bit LUNs
  target: Drop duplicate + unused se_dev_check_wce
  target: Drop unnecessary core_tpg_register TFO parameter
  ...

4 files changed, 38 insertions, 248 deletions

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 4a484d60be0d..b749026aa592 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1191,7 +1191,7 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
         list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) {
                 struct qla_tgt_cmd *cmd =
                         container_of(se_cmd, struct qla_tgt_cmd, se_cmd);
-                if (cmd->tag == abts->exchange_addr_to_abort) {
+                if (se_cmd->tag == abts->exchange_addr_to_abort) {
                         lun = cmd->unpacked_lun;
                         found_lun = true;
                         break;
@@ -1728,9 +1728,8 @@ static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd,
 
         if (unlikely(cmd->aborted)) {
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf014,
-                    "qla_target(%d): terminating exchange "
-                    "for aborted cmd=%p (se_cmd=%p, tag=%d)", vha->vp_idx, cmd,
-                    se_cmd, cmd->tag);
+                       "qla_target(%d): terminating exchange for aborted cmd=%p (se_cmd=%p, tag=%lld)",
+                       vha->vp_idx, cmd, se_cmd, se_cmd->tag);
 
                 cmd->state = QLA_TGT_STATE_ABORTED;
                 cmd->cmd_flags |= BIT_6;
@@ -1765,18 +1764,17 @@ static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd,
         if (se_cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) {
                 prm->residual = se_cmd->residual_count;
                 ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x305c,
-                    "Residual underflow: %d (tag %d, "
-                    "op %x, bufflen %d, rq_result %x)\n", prm->residual,
-                    cmd->tag, se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
-                    cmd->bufflen, prm->rq_result);
+                    "Residual underflow: %d (tag %lld, op %x, bufflen %d, rq_result %x)\n",
+                       prm->residual, se_cmd->tag,
+                       se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
+                       cmd->bufflen, prm->rq_result);
                 prm->rq_result |= SS_RESIDUAL_UNDER;
         } else if (se_cmd->se_cmd_flags & SCF_OVERFLOW_BIT) {
                 prm->residual = se_cmd->residual_count;
                 ql_dbg(ql_dbg_io, vha, 0x305d,
-                    "Residual overflow: %d (tag %d, "
-                    "op %x, bufflen %d, rq_result %x)\n", prm->residual,
-                    cmd->tag, se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
-                    cmd->bufflen, prm->rq_result);
+                    "Residual overflow: %d (tag %lld, op %x, bufflen %d, rq_result %x)\n",
+                       prm->residual, se_cmd->tag, se_cmd->t_task_cdb ?
+                       se_cmd->t_task_cdb[0] : 0, cmd->bufflen, prm->rq_result);
                 prm->rq_result |= SS_RESIDUAL_OVER;
         }
 
@@ -1849,7 +1847,7 @@ static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type)
             == 50) {
                 *xmit_type &= ~QLA_TGT_XMIT_STATUS;
                 ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf015,
-                    "Dropping cmd %p (tag %d) status", cmd, cmd->tag);
+                    "Dropping cmd %p (tag %d) status", cmd, se_cmd->tag);
         }
 #endif
         /*
@@ -1873,7 +1871,7 @@ static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type)
                 ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf016,
                     "Cutting cmd %p (tag %d) buffer"
                     " tail to len %d, sg_cnt %d (cmd->bufflen %d,"
-                    " cmd->sg_cnt %d)", cmd, cmd->tag, tot_len, leave,
+                    " cmd->sg_cnt %d)", cmd, se_cmd->tag, tot_len, leave,
                     cmd->bufflen, cmd->sg_cnt);
 
                 cmd->bufflen = tot_len;
@@ -1885,13 +1883,13 @@ static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type)
 
                 ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf017,
                     "Cutting cmd %p (tag %d) buffer head "
-                    "to offset %d (cmd->bufflen %d)", cmd, cmd->tag, offset,
+                    "to offset %d (cmd->bufflen %d)", cmd, se_cmd->tag, offset,
                     cmd->bufflen);
                 if (offset == 0)
                         *xmit_type &= ~QLA_TGT_XMIT_DATA;
                 else if (qlt_set_data_offset(cmd, offset)) {
                         ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf018,
-                            "qlt_set_data_offset() failed (tag %d)", cmd->tag);
+                            "qlt_set_data_offset() failed (tag %d)", se_cmd->tag);
                 }
         }
 }
@@ -3194,7 +3192,7 @@ skip_term:
                 return;
         } else if (cmd->state == QLA_TGT_STATE_ABORTED) {
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01e,
-                    "Aborted command %p (tag %d) finished\n", cmd, cmd->tag);
+                  "Aborted command %p (tag %lld) finished\n", cmd, se_cmd->tag);
         } else {
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05c,
                     "qla_target(%d): A command in state (%d) should "
@@ -3266,7 +3264,7 @@ static void __qlt_do_work(struct qla_tgt_cmd *cmd)
                 goto out_term;
 
         cdb = &atio->u.isp24.fcp_cmnd.cdb[0];
-        cmd->tag = atio->u.isp24.exchange_addr;
+        cmd->se_cmd.tag = atio->u.isp24.exchange_addr;
         cmd->unpacked_lun = scsilun_to_int(
             (struct scsi_lun *)&atio->u.isp24.fcp_cmnd.lun);
 
@@ -3893,9 +3891,8 @@ static void qlt_handle_srr(struct scsi_qla_host *vha,
                         resp = 1;
                 } else {
                         ql_dbg(ql_dbg_tgt_mgt, vha, 0xf064,
-                            "qla_target(%d): SRR for in data for cmd "
-                            "without them (tag %d, SCSI status %d), "
-                            "reject", vha->vp_idx, cmd->tag,
+                               "qla_target(%d): SRR for in data for cmd without them (tag %lld, SCSI status %d), reject",
+                               vha->vp_idx, se_cmd->tag,
                             cmd->se_cmd.scsi_status);
                         goto out_reject;
                 }
@@ -3929,10 +3926,8 @@ static void qlt_handle_srr(struct scsi_qla_host *vha,
                         }
                 } else {
                         ql_dbg(ql_dbg_tgt_mgt, vha, 0xf066,
-                            "qla_target(%d): SRR for out data for cmd "
-                            "without them (tag %d, SCSI status %d), "
-                            "reject", vha->vp_idx, cmd->tag,
-                            cmd->se_cmd.scsi_status);
+                            "qla_target(%d): SRR for out data for cmd without them (tag %lld, SCSI status %d), reject",
+                               vha->vp_idx, se_cmd->tag, cmd->se_cmd.scsi_status);
                         goto out_reject;
                 }
                 break;
@@ -4053,10 +4048,9 @@ restart:
                 cmd->sg = se_cmd->t_data_sg;
 
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02c,
-                    "SRR cmd %p (se_cmd %p, tag %d, op %x), "
-                    "sg_cnt=%d, offset=%d", cmd, &cmd->se_cmd, cmd->tag,
-                    se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
-                    cmd->sg_cnt, cmd->offset);
+                       "SRR cmd %p (se_cmd %p, tag %lld, op %x), sg_cnt=%d, offset=%d",
+                       cmd, &cmd->se_cmd, se_cmd->tag, se_cmd->t_task_cdb ?
+                       se_cmd->t_task_cdb[0] : 0, cmd->sg_cnt, cmd->offset);
 
                 qlt_handle_srr(vha, sctio, imm);
 
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index 332086776dfe..985d76dd706b 100644
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -924,7 +924,6 @@ struct qla_tgt_cmd {
         int sg_cnt;             /* SG segments count */
         int bufflen;            /* cmd buffer length */
         int offset;
-        uint32_t tag;
         uint32_t unpacked_lun;
         enum dma_data_direction dma_data_direction;
         uint32_t reset_count;
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index e32d24ec7a11..d9a8c6084346 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -44,7 +44,6 @@
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
 #include <target/target_core_fabric_configfs.h>
-#include <target/target_core_configfs.h>
 #include <target/configfs_macros.h>
 
 #include "qla_def.h"
@@ -54,9 +53,6 @@
 static struct workqueue_struct *tcm_qla2xxx_free_wq;
 static struct workqueue_struct *tcm_qla2xxx_cmd_wq;
 
-static const struct target_core_fabric_ops tcm_qla2xxx_ops;
-static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops;
-
 /*
  * Parse WWN.
  * If strict, we require lower-case hex and colon separators to be sure
@@ -191,23 +187,6 @@ static char *tcm_qla2xxx_npiv_get_fabric_name(void)
         return "qla2xxx_npiv";
 }
 
-static u8 tcm_qla2xxx_get_fabric_proto_ident(struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-        u8 proto_id;
-
-        switch (lport->lport_proto_id) {
-        case SCSI_PROTOCOL_FCP:
-        default:
-                proto_id = fc_get_fabric_proto_ident(se_tpg);
-                break;
-        }
-
-        return proto_id;
-}
-
 static char *tcm_qla2xxx_get_fabric_wwn(struct se_portal_group *se_tpg)
 {
         struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
@@ -224,78 +203,6 @@ static u16 tcm_qla2xxx_get_tag(struct se_portal_group *se_tpg)
         return tpg->lport_tpgt;
 }
 
-static u32 tcm_qla2xxx_get_default_depth(struct se_portal_group *se_tpg)
-{
-        return 1;
-}
-
-static u32 tcm_qla2xxx_get_pr_transport_id(
-        struct se_portal_group *se_tpg,
-        struct se_node_acl *se_nacl,
-        struct t10_pr_registration *pr_reg,
-        int *format_code,
-        unsigned char *buf)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-        int ret = 0;
-
-        switch (lport->lport_proto_id) {
-        case SCSI_PROTOCOL_FCP:
-        default:
-                ret = fc_get_pr_transport_id(se_tpg, se_nacl, pr_reg,
-                                        format_code, buf);
-                break;
-        }
-
-        return ret;
-}
-
-static u32 tcm_qla2xxx_get_pr_transport_id_len(
-        struct se_portal_group *se_tpg,
-        struct se_node_acl *se_nacl,
-        struct t10_pr_registration *pr_reg,
-        int *format_code)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-        int ret = 0;
-
-        switch (lport->lport_proto_id) {
-        case SCSI_PROTOCOL_FCP:
-        default:
-                ret = fc_get_pr_transport_id_len(se_tpg, se_nacl, pr_reg,
-                                        format_code);
-                break;
-        }
-
-        return ret;
-}
-
-static char *tcm_qla2xxx_parse_pr_out_transport_id(
-        struct se_portal_group *se_tpg,
-        const char *buf,
-        u32 *out_tid_len,
-        char **port_nexus_ptr)
-{
-        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
-                                struct tcm_qla2xxx_tpg, se_tpg);
-        struct tcm_qla2xxx_lport *lport = tpg->lport;
-        char *tid = NULL;
-
-        switch (lport->lport_proto_id) {
-        case SCSI_PROTOCOL_FCP:
-        default:
-                tid = fc_parse_pr_out_transport_id(se_tpg, buf, out_tid_len,
-                                        port_nexus_ptr);
-                break;
-        }
-
-        return tid;
-}
-
 static int tcm_qla2xxx_check_demo_mode(struct se_portal_group *se_tpg)
 {
         struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
@@ -344,29 +251,6 @@ static int tcm_qla2xxx_check_prot_fabric_only(struct se_portal_group *se_tpg)
         return tpg->tpg_attrib.fabric_prot_type;
 }
 
-static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl(
-        struct se_portal_group *se_tpg)
-{
-        struct tcm_qla2xxx_nacl *nacl;
-
-        nacl = kzalloc(sizeof(struct tcm_qla2xxx_nacl), GFP_KERNEL);
-        if (!nacl) {
-                pr_err("Unable to allocate struct tcm_qla2xxx_nacl\n");
-                return NULL;
-        }
-
-        return &nacl->se_node_acl;
-}
-
-static void tcm_qla2xxx_release_fabric_acl(
-        struct se_portal_group *se_tpg,
-        struct se_node_acl *se_nacl)
-{
-        struct tcm_qla2xxx_nacl *nacl = container_of(se_nacl,
-                        struct tcm_qla2xxx_nacl, se_node_acl);
-        kfree(nacl);
-}
-
 static u32 tcm_qla2xxx_tpg_get_inst_index(struct se_portal_group *se_tpg)
 {
         struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
@@ -430,7 +314,7 @@ static int tcm_qla2xxx_check_stop_free(struct se_cmd *se_cmd)
                 cmd->cmd_flags |= BIT_14;
         }
 
-        return target_put_sess_cmd(se_cmd->se_sess, se_cmd);
+        return target_put_sess_cmd(se_cmd);
 }
 
 /* tcm_qla2xxx_release_cmd - Callback from TCM Core to release underlying
@@ -534,19 +418,6 @@ static void tcm_qla2xxx_set_default_node_attrs(struct se_node_acl *nacl)
         return;
 }
 
-static u32 tcm_qla2xxx_get_task_tag(struct se_cmd *se_cmd)
-{
-        struct qla_tgt_cmd *cmd;
-
-        /* check for task mgmt cmd */
-        if (se_cmd->se_cmd_flags & SCF_SCSI_TMR_CDB)
-                return 0xffffffff;
-
-        cmd = container_of(se_cmd, struct qla_tgt_cmd, se_cmd);
-
-        return cmd->tag;
-}
-
 static int tcm_qla2xxx_get_cmd_state(struct se_cmd *se_cmd)
 {
         return 0;
@@ -827,17 +698,6 @@ static void tcm_qla2xxx_release_session(struct kref *kref)
         qlt_unreg_sess(se_sess->fabric_sess_ptr);
 }
 
-static void tcm_qla2xxx_put_session(struct se_session *se_sess)
-{
-        struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
-        struct qla_hw_data *ha = sess->vha->hw;
-        unsigned long flags;
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        kref_put(&se_sess->sess_kref, tcm_qla2xxx_release_session);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-}
-
 static void tcm_qla2xxx_put_sess(struct qla_tgt_sess *sess)
 {
         if (!sess)
@@ -853,53 +713,20 @@ static void tcm_qla2xxx_shutdown_sess(struct qla_tgt_sess *sess)
         target_sess_cmd_list_set_waiting(sess->se_sess);
 }
 
-static struct se_node_acl *tcm_qla2xxx_make_nodeacl(
-        struct se_portal_group *se_tpg,
-        struct config_group *group,
-        const char *name)
+static int tcm_qla2xxx_init_nodeacl(struct se_node_acl *se_nacl,
+                const char *name)
 {
-        struct se_node_acl *se_nacl, *se_nacl_new;
-        struct tcm_qla2xxx_nacl *nacl;
+        struct tcm_qla2xxx_nacl *nacl =
+                container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
         u64 wwnn;
-        u32 qla2xxx_nexus_depth;
 
         if (tcm_qla2xxx_parse_wwn(name, &wwnn, 1) < 0)
-                return ERR_PTR(-EINVAL);
-
-        se_nacl_new = tcm_qla2xxx_alloc_fabric_acl(se_tpg);
-        if (!se_nacl_new)
-                return ERR_PTR(-ENOMEM);
-/* #warning FIXME: Hardcoded qla2xxx_nexus depth in tcm_qla2xxx_make_nodeacl */
-        qla2xxx_nexus_depth = 1;
+                return -EINVAL;
 
-        /*
-         * se_nacl_new may be released by core_tpg_add_initiator_node_acl()
-         * when converting a NodeACL from demo mode -> explict
-         */
-        se_nacl = core_tpg_add_initiator_node_acl(se_tpg, se_nacl_new,
-                                name, qla2xxx_nexus_depth);
-        if (IS_ERR(se_nacl)) {
-                tcm_qla2xxx_release_fabric_acl(se_tpg, se_nacl_new);
-                return se_nacl;
-        }
-        /*
-         * Locate our struct tcm_qla2xxx_nacl and set the FC Nport WWPN
-         */
-        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
         nacl->nport_wwnn = wwnn;
         tcm_qla2xxx_format_wwn(&nacl->nport_name[0], TCM_QLA2XXX_NAMELEN, wwnn);
 
-        return se_nacl;
-}
-
-static void tcm_qla2xxx_drop_nodeacl(struct se_node_acl *se_acl)
-{
-        struct se_portal_group *se_tpg = se_acl->se_tpg;
-        struct tcm_qla2xxx_nacl *nacl = container_of(se_acl,
-                                struct tcm_qla2xxx_nacl, se_node_acl);
-
-        core_tpg_del_initiator_node_acl(se_tpg, se_acl, 1);
-        kfree(nacl);
+        return 0;
 }
 
 /* Start items for tcm_qla2xxx_tpg_attrib_cit */
@@ -1175,8 +1002,7 @@ static struct se_portal_group *tcm_qla2xxx_make_tpg(
         tpg->tpg_attrib.cache_dynamic_acls = 1;
         tpg->tpg_attrib.demo_mode_login_only = 1;
 
-        ret = core_tpg_register(&tcm_qla2xxx_ops, wwn,
-                                &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
+        ret = core_tpg_register(wwn, &tpg->se_tpg, SCSI_PROTOCOL_FCP);
         if (ret < 0) {
                 kfree(tpg);
                 return NULL;
@@ -1295,8 +1121,7 @@ static struct se_portal_group *tcm_qla2xxx_npiv_make_tpg(
         tpg->tpg_attrib.cache_dynamic_acls = 1;
         tpg->tpg_attrib.demo_mode_login_only = 1;
 
-        ret = core_tpg_register(&tcm_qla2xxx_npiv_ops, wwn,
-                                &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
+        ret = core_tpg_register(wwn, &tpg->se_tpg, SCSI_PROTOCOL_FCP);
         if (ret < 0) {
                 kfree(tpg);
                 return NULL;
@@ -1988,14 +1813,10 @@ static struct configfs_attribute *tcm_qla2xxx_wwn_attrs[] = {
 static const struct target_core_fabric_ops tcm_qla2xxx_ops = {
         .module                         = THIS_MODULE,
         .name                           = "qla2xxx",
+        .node_acl_size                  = sizeof(struct tcm_qla2xxx_nacl),
         .get_fabric_name                = tcm_qla2xxx_get_fabric_name,
-        .get_fabric_proto_ident         = tcm_qla2xxx_get_fabric_proto_ident,
         .tpg_get_wwn                    = tcm_qla2xxx_get_fabric_wwn,
         .tpg_get_tag                    = tcm_qla2xxx_get_tag,
-        .tpg_get_default_depth          = tcm_qla2xxx_get_default_depth,
-        .tpg_get_pr_transport_id        = tcm_qla2xxx_get_pr_transport_id,
-        .tpg_get_pr_transport_id_len    = tcm_qla2xxx_get_pr_transport_id_len,
-        .tpg_parse_pr_out_transport_id  = tcm_qla2xxx_parse_pr_out_transport_id,
         .tpg_check_demo_mode            = tcm_qla2xxx_check_demo_mode,
         .tpg_check_demo_mode_cache      = tcm_qla2xxx_check_demo_mode_cache,
         .tpg_check_demo_mode_write_protect =
@@ -2004,12 +1825,9 @@ static const struct target_core_fabric_ops tcm_qla2xxx_ops = {
                                         tcm_qla2xxx_check_prod_write_protect,
         .tpg_check_prot_fabric_only     = tcm_qla2xxx_check_prot_fabric_only,
         .tpg_check_demo_mode_login_only = tcm_qla2xxx_check_demo_mode_login_only,
-        .tpg_alloc_fabric_acl           = tcm_qla2xxx_alloc_fabric_acl,
-        .tpg_release_fabric_acl         = tcm_qla2xxx_release_fabric_acl,
         .tpg_get_inst_index             = tcm_qla2xxx_tpg_get_inst_index,
         .check_stop_free                = tcm_qla2xxx_check_stop_free,
         .release_cmd                    = tcm_qla2xxx_release_cmd,
-        .put_session                    = tcm_qla2xxx_put_session,
         .shutdown_session               = tcm_qla2xxx_shutdown_session,
         .close_session                  = tcm_qla2xxx_close_session,
         .sess_get_index                 = tcm_qla2xxx_sess_get_index,
@@ -2017,7 +1835,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_ops = {
         .write_pending                  = tcm_qla2xxx_write_pending,
         .write_pending_status           = tcm_qla2xxx_write_pending_status,
         .set_default_node_attributes    = tcm_qla2xxx_set_default_node_attrs,
-        .get_task_tag                   = tcm_qla2xxx_get_task_tag,
         .get_cmd_state                  = tcm_qla2xxx_get_cmd_state,
         .queue_data_in                  = tcm_qla2xxx_queue_data_in,
         .queue_status                   = tcm_qla2xxx_queue_status,
@@ -2031,12 +1848,7 @@ static const struct target_core_fabric_ops tcm_qla2xxx_ops = {
         .fabric_drop_wwn                = tcm_qla2xxx_drop_lport,
         .fabric_make_tpg                = tcm_qla2xxx_make_tpg,
         .fabric_drop_tpg                = tcm_qla2xxx_drop_tpg,
-        .fabric_post_link               = NULL,
-        .fabric_pre_unlink              = NULL,
-        .fabric_make_np                 = NULL,
-        .fabric_drop_np                 = NULL,
-        .fabric_make_nodeacl            = tcm_qla2xxx_make_nodeacl,
-        .fabric_drop_nodeacl            = tcm_qla2xxx_drop_nodeacl,
+        .fabric_init_nodeacl            = tcm_qla2xxx_init_nodeacl,
 
         .tfc_wwn_attrs                  = tcm_qla2xxx_wwn_attrs,
         .tfc_tpg_base_attrs             = tcm_qla2xxx_tpg_attrs,
@@ -2046,26 +1858,19 @@ static const struct target_core_fabric_ops tcm_qla2xxx_ops = {
 static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
         .module                         = THIS_MODULE,
         .name                           = "qla2xxx_npiv",
+        .node_acl_size                  = sizeof(struct tcm_qla2xxx_nacl),
         .get_fabric_name                = tcm_qla2xxx_npiv_get_fabric_name,
-        .get_fabric_proto_ident         = tcm_qla2xxx_get_fabric_proto_ident,
         .tpg_get_wwn                    = tcm_qla2xxx_get_fabric_wwn,
         .tpg_get_tag                    = tcm_qla2xxx_get_tag,
-        .tpg_get_default_depth          = tcm_qla2xxx_get_default_depth,
-        .tpg_get_pr_transport_id        = tcm_qla2xxx_get_pr_transport_id,
-        .tpg_get_pr_transport_id_len    = tcm_qla2xxx_get_pr_transport_id_len,
-        .tpg_parse_pr_out_transport_id  = tcm_qla2xxx_parse_pr_out_transport_id,
         .tpg_check_demo_mode            = tcm_qla2xxx_check_demo_mode,
         .tpg_check_demo_mode_cache      = tcm_qla2xxx_check_demo_mode_cache,
         .tpg_check_demo_mode_write_protect = tcm_qla2xxx_check_demo_mode,
         .tpg_check_prod_mode_write_protect =
             tcm_qla2xxx_check_prod_write_protect,
         .tpg_check_demo_mode_login_only = tcm_qla2xxx_check_demo_mode_login_only,
-        .tpg_alloc_fabric_acl           = tcm_qla2xxx_alloc_fabric_acl,
-        .tpg_release_fabric_acl         = tcm_qla2xxx_release_fabric_acl,
         .tpg_get_inst_index             = tcm_qla2xxx_tpg_get_inst_index,
         .check_stop_free                = tcm_qla2xxx_check_stop_free,
         .release_cmd                    = tcm_qla2xxx_release_cmd,
-        .put_session                    = tcm_qla2xxx_put_session,
         .shutdown_session               = tcm_qla2xxx_shutdown_session,
         .close_session                  = tcm_qla2xxx_close_session,
         .sess_get_index                 = tcm_qla2xxx_sess_get_index,
@@ -2073,7 +1878,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
         .write_pending                  = tcm_qla2xxx_write_pending,
         .write_pending_status           = tcm_qla2xxx_write_pending_status,
         .set_default_node_attributes    = tcm_qla2xxx_set_default_node_attrs,
-        .get_task_tag                   = tcm_qla2xxx_get_task_tag,
         .get_cmd_state                  = tcm_qla2xxx_get_cmd_state,
         .queue_data_in                  = tcm_qla2xxx_queue_data_in,
         .queue_status                   = tcm_qla2xxx_queue_status,
@@ -2087,12 +1891,7 @@ static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
         .fabric_drop_wwn                = tcm_qla2xxx_npiv_drop_lport,
         .fabric_make_tpg                = tcm_qla2xxx_npiv_make_tpg,
         .fabric_drop_tpg                = tcm_qla2xxx_drop_tpg,
-        .fabric_post_link               = NULL,
-        .fabric_pre_unlink              = NULL,
-        .fabric_make_np                 = NULL,
-        .fabric_drop_np                 = NULL,
-        .fabric_make_nodeacl            = tcm_qla2xxx_make_nodeacl,
-        .fabric_drop_nodeacl            = tcm_qla2xxx_drop_nodeacl,
+        .fabric_init_nodeacl            = tcm_qla2xxx_init_nodeacl,
 
         .tfc_wwn_attrs                  = tcm_qla2xxx_wwn_attrs,
         .tfc_tpg_base_attrs             = tcm_qla2xxx_npiv_tpg_attrs,
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.h b/drivers/scsi/qla2xxx/tcm_qla2xxx.h
index 23295115c9fc..3bbf4cb6fd97 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.h
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.h
@@ -13,6 +13,8 @@
 #include "qla_target.h"
 
 struct tcm_qla2xxx_nacl {
+        struct se_node_acl se_node_acl;
+
         /* From libfc struct fc_rport->port_id */
         u32 nport_id;
         /* Binary World Wide unique Node Name for remote FC Initiator Nport */
@@ -23,8 +25,6 @@ struct tcm_qla2xxx_nacl {
         struct qla_tgt_sess *qla_tgt_sess;
         /* Pointer to TCM FC nexus */
         struct se_session *nport_nexus;
-        /* Returned by tcm_qla2xxx_make_nodeacl() */
-        struct se_node_acl se_node_acl;
 };
 
 struct tcm_qla2xxx_tpg_attrib {
@@ -57,8 +57,6 @@ struct tcm_qla2xxx_fc_loopid {
 };
 
 struct tcm_qla2xxx_lport {
-        /* SCSI protocol the lport is providing */
-        u8 lport_proto_id;
         /* Binary World Wide unique Port Name for FC Target Lport */
         u64 lport_wwpn;
         /* Binary World Wide unique Port Name for FC NPIV Target Lport */