Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This is mostly update of the usual drivers: smarpqi, lpfc, qedi,
  megaraid_sas, libsas, zfcp, mpt3sas, hisi_sas.

  Additionally, we have a pile of annotation, unused variable and minor
  updates.

  The big API change is the updates for Christoph's DMA rework which
  include removing the DISABLE_CLUSTERING flag.

  And finally there are a couple of target tree updates"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (259 commits)
  scsi: isci: request: mark expected switch fall-through
  scsi: isci: remote_node_context: mark expected switch fall-throughs
  scsi: isci: remote_device: Mark expected switch fall-throughs
  scsi: isci: phy: Mark expected switch fall-through
  scsi: iscsi: Capture iscsi debug messages using tracepoints
  scsi: myrb: Mark expected switch fall-throughs
  scsi: megaraid: fix out-of-bound array accesses
  scsi: mpt3sas: mpt3sas_scsih: Mark expected switch fall-through
  scsi: fcoe: remove set but not used variable 'port'
  scsi: smartpqi: call pqi_free_interrupts() in pqi_shutdown()
  scsi: smartpqi: fix build warnings
  scsi: smartpqi: update driver version
  scsi: smartpqi: add ofa support
  scsi: smartpqi: increase fw status register read timeout
  scsi: smartpqi: bump driver version
  scsi: smartpqi: add smp_utils support
  scsi: smartpqi: correct lun reset issues
  scsi: smartpqi: correct volume status
  scsi: smartpqi: do not offline disks for transient did no connect conditions
  scsi: smartpqi: allow for larger raid maps
  ...

21 files changed, 500 insertions, 570 deletions

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index c1d5a173553d..984941e036c8 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -1493,8 +1493,6 @@ __iscsit_check_dataout_hdr(struct iscsi_conn *conn, void *buf,
                         if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
                                 iscsit_stop_dataout_timer(cmd);
 
-                        transport_check_aborted_status(se_cmd,
-                                        (hdr->flags & ISCSI_FLAG_CMD_FINAL));
                         return iscsit_dump_data_payload(conn, payload_length, 1);
                 }
         } else {
@@ -1509,12 +1507,9 @@ __iscsit_check_dataout_hdr(struct iscsi_conn *conn, void *buf,
                  * TASK_ABORTED status.
                  */
                 if (se_cmd->transport_state & CMD_T_ABORTED) {
-                        if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
-                                if (--cmd->outstanding_r2ts < 1) {
-                                        iscsit_stop_dataout_timer(cmd);
-                                        transport_check_aborted_status(
-                                                        se_cmd, 1);
-                                }
+                        if (hdr->flags & ISCSI_FLAG_CMD_FINAL &&
+                            --cmd->outstanding_r2ts < 1)
+                                iscsit_stop_dataout_timer(cmd);
 
                         return iscsit_dump_data_payload(conn, payload_length, 1);
                 }
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 95d0a22b2ad6..a5481dfeae8d 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1343,11 +1343,6 @@ static struct configfs_attribute *lio_target_discovery_auth_attrs[] = {
 
 /* Start functions for target_core_fabric_ops */
 
-static char *iscsi_get_fabric_name(void)
-{
-        return "iSCSI";
-}
-
 static int iscsi_get_cmd_state(struct se_cmd *se_cmd)
 {
         struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
@@ -1549,9 +1544,9 @@ static void lio_release_cmd(struct se_cmd *se_cmd)
 
 const struct target_core_fabric_ops iscsi_ops = {
         .module                         = THIS_MODULE,
-        .name                           = "iscsi",
+        .fabric_alias                   = "iscsi",
+        .fabric_name                    = "iSCSI",
         .node_acl_size                  = sizeof(struct iscsi_node_acl),
-        .get_fabric_name                = iscsi_get_fabric_name,
         .tpg_get_wwn                    = lio_tpg_get_endpoint_wwn,
         .tpg_get_tag                    = lio_tpg_get_tag,
         .tpg_get_default_depth          = lio_tpg_get_default_depth,
@@ -1596,4 +1591,6 @@ const struct target_core_fabric_ops iscsi_ops = {
         .tfc_tpg_nacl_attrib_attrs      = lio_target_nacl_attrib_attrs,
         .tfc_tpg_nacl_auth_attrs        = lio_target_nacl_auth_attrs,
         .tfc_tpg_nacl_param_attrs       = lio_target_nacl_param_attrs,
+
+        .write_pending_must_be_called   = true,
 };
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index a211e8154f4c..1b54a9c70851 100644
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -943,20 +943,8 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo)
                                 return 0;
                         }
                         spin_unlock_bh(&cmd->istate_lock);
-                        /*
-                         * Determine if delayed TASK_ABORTED status for WRITEs
-                         * should be sent now if no unsolicited data out
-                         * payloads are expected, or if the delayed status
-                         * should be sent after unsolicited data out with
-                         * ISCSI_FLAG_CMD_FINAL set in iscsi_handle_data_out()
-                         */
-                        if (transport_check_aborted_status(se_cmd,
-                                        (cmd->unsolicited_data == 0)) != 0)
+                        if (cmd->se_cmd.transport_state & CMD_T_ABORTED)
                                 return 0;
-                        /*
-                         * Otherwise send CHECK_CONDITION and sense for
-                         * exception
-                         */
                         return transport_send_check_condition_and_sense(se_cmd,
                                         cmd->sense_reason, 0);
                 }
@@ -974,13 +962,7 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo)
 
                         if (!(cmd->cmd_flags &
                                         ICF_NON_IMMEDIATE_UNSOLICITED_DATA)) {
-                                /*
-                                 * Send the delayed TASK_ABORTED status for
-                                 * WRITEs if no more unsolicitied data is
-                                 * expected.
-                                 */
-                                if (transport_check_aborted_status(se_cmd, 1)
-                                                != 0)
+                                if (cmd->se_cmd.transport_state & CMD_T_ABORTED)
                                         return 0;
 
                                 iscsit_set_dataout_sequence_values(cmd);
@@ -995,11 +977,7 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo)
 
                 if ((cmd->data_direction == DMA_TO_DEVICE) &&
                     !(cmd->cmd_flags & ICF_NON_IMMEDIATE_UNSOLICITED_DATA)) {
-                        /*
-                         * Send the delayed TASK_ABORTED status for WRITEs if
-                         * no more nsolicitied data is expected.
-                         */
-                        if (transport_check_aborted_status(se_cmd, 1) != 0)
+                        if (cmd->se_cmd.transport_state & CMD_T_ABORTED)
                                 return 0;
 
                         iscsit_set_unsoliticed_dataout(cmd);
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index bc8918f382e4..7bd7c0c0db6f 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -324,7 +324,7 @@ static struct scsi_host_template tcm_loop_driver_template = {
         .sg_tablesize           = 256,
         .cmd_per_lun            = 1024,
         .max_sectors            = 0xFFFF,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
         .slave_alloc            = tcm_loop_slave_alloc,
         .module                 = THIS_MODULE,
         .track_queue_depth      = 1,
@@ -460,11 +460,6 @@ static void tcm_loop_release_core_bus(void)
         pr_debug("Releasing TCM Loop Core BUS\n");
 }
 
-static char *tcm_loop_get_fabric_name(void)
-{
-        return "loopback";
-}
-
 static inline struct tcm_loop_tpg *tl_tpg(struct se_portal_group *se_tpg)
 {
         return container_of(se_tpg, struct tcm_loop_tpg, tl_se_tpg);
@@ -1149,8 +1144,7 @@ static struct configfs_attribute *tcm_loop_wwn_attrs[] = {
 
 static const struct target_core_fabric_ops loop_ops = {
         .module                         = THIS_MODULE,
-        .name                           = "loopback",
-        .get_fabric_name                = tcm_loop_get_fabric_name,
+        .fabric_name                    = "loopback",
         .tpg_get_wwn                    = tcm_loop_get_endpoint_wwn,
         .tpg_get_tag                    = tcm_loop_get_tag,
         .tpg_check_demo_mode            = tcm_loop_check_demo_mode,
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index 3d10189ecedc..08cee13dfb9a 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -1694,11 +1694,6 @@ static int sbp_check_false(struct se_portal_group *se_tpg)
         return 0;
 }
 
-static char *sbp_get_fabric_name(void)
-{
-        return "sbp";
-}
-
 static char *sbp_get_fabric_wwn(struct se_portal_group *se_tpg)
 {
         struct sbp_tpg *tpg = container_of(se_tpg, struct sbp_tpg, se_tpg);
@@ -2323,8 +2318,7 @@ static struct configfs_attribute *sbp_tpg_attrib_attrs[] = {
 
 static const struct target_core_fabric_ops sbp_ops = {
         .module                         = THIS_MODULE,
-        .name                           = "sbp",
-        .get_fabric_name                = sbp_get_fabric_name,
+        .fabric_name                    = "sbp",
         .tpg_get_wwn                    = sbp_get_fabric_wwn,
         .tpg_get_tag                    = sbp_get_tag,
         .tpg_check_demo_mode            = sbp_check_true,
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 4f134b0c3e29..6b0d9beacf90 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -451,7 +451,7 @@ static inline void set_ascq(struct se_cmd *cmd, u8 alua_ascq)
         pr_debug("[%s]: ALUA TG Port not available, "
                 "SenseKey: NOT_READY, ASC/ASCQ: "
                 "0x04/0x%02x\n",
-                cmd->se_tfo->get_fabric_name(), alua_ascq);
+                cmd->se_tfo->fabric_name, alua_ascq);
 
         cmd->scsi_asc = 0x04;
         cmd->scsi_ascq = alua_ascq;
@@ -1229,13 +1229,13 @@ static int core_alua_update_tpg_secondary_metadata(struct se_lun *lun)
 
         if (se_tpg->se_tpg_tfo->tpg_get_tag != NULL) {
                 path = kasprintf(GFP_KERNEL, "%s/alua/%s/%s+%hu/lun_%llu",
-                                db_root, se_tpg->se_tpg_tfo->get_fabric_name(),
+                                db_root, se_tpg->se_tpg_tfo->fabric_name,
                                 se_tpg->se_tpg_tfo->tpg_get_wwn(se_tpg),
                                 se_tpg->se_tpg_tfo->tpg_get_tag(se_tpg),
                                 lun->unpacked_lun);
         } else {
                 path = kasprintf(GFP_KERNEL, "%s/alua/%s/%s/lun_%llu",
-                                db_root, se_tpg->se_tpg_tfo->get_fabric_name(),
+                                db_root, se_tpg->se_tpg_tfo->fabric_name,
                                 se_tpg->se_tpg_tfo->tpg_get_wwn(se_tpg),
                                 lun->unpacked_lun);
         }
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index f6b1549f4142..72016d0dfca5 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -172,7 +172,10 @@ static struct target_fabric_configfs *target_core_get_fabric(
 
         mutex_lock(&g_tf_lock);
         list_for_each_entry(tf, &g_tf_list, tf_list) {
-                if (!strcmp(tf->tf_ops->name, name)) {
+                const char *cmp_name = tf->tf_ops->fabric_alias;
+                if (!cmp_name)
+                        cmp_name = tf->tf_ops->fabric_name;
+                if (!strcmp(cmp_name, name)) {
                         atomic_inc(&tf->tf_access_cnt);
                         mutex_unlock(&g_tf_lock);
                         return tf;
@@ -249,7 +252,7 @@ static struct config_group *target_core_register_fabric(
                 return ERR_PTR(-EINVAL);
         }
         pr_debug("Target_Core_ConfigFS: REGISTER -> Located fabric:"
-                        " %s\n", tf->tf_ops->name);
+                        " %s\n", tf->tf_ops->fabric_name);
         /*
          * On a successful target_core_get_fabric() look, the returned
          * struct target_fabric_configfs *tf will contain a usage reference.
@@ -282,7 +285,7 @@ static void target_core_deregister_fabric(
                 " tf list\n", config_item_name(item));
 
         pr_debug("Target_Core_ConfigFS: DEREGISTER -> located fabric:"
-                        " %s\n", tf->tf_ops->name);
+                        " %s\n", tf->tf_ops->fabric_name);
         atomic_dec(&tf->tf_access_cnt);
 
         pr_debug("Target_Core_ConfigFS: DEREGISTER -> Releasing ci"
@@ -342,17 +345,20 @@ EXPORT_SYMBOL(target_undepend_item);
 
 static int target_fabric_tf_ops_check(const struct target_core_fabric_ops *tfo)
 {
-        if (!tfo->name) {
-                pr_err("Missing tfo->name\n");
-                return -EINVAL;
+        if (tfo->fabric_alias) {
+                if (strlen(tfo->fabric_alias) >= TARGET_FABRIC_NAME_SIZE) {
+                        pr_err("Passed alias: %s exceeds "
+                                "TARGET_FABRIC_NAME_SIZE\n", tfo->fabric_alias);
+                        return -EINVAL;
+                }
         }
-        if (strlen(tfo->name) >= TARGET_FABRIC_NAME_SIZE) {
-                pr_err("Passed name: %s exceeds TARGET_FABRIC"
-                        "_NAME_SIZE\n", tfo->name);
+        if (!tfo->fabric_name) {
+                pr_err("Missing tfo->fabric_name\n");
                 return -EINVAL;
         }
-        if (!tfo->get_fabric_name) {
-                pr_err("Missing tfo->get_fabric_name()\n");
+        if (strlen(tfo->fabric_name) >= TARGET_FABRIC_NAME_SIZE) {
+                pr_err("Passed name: %s exceeds "
+                        "TARGET_FABRIC_NAME_SIZE\n", tfo->fabric_name);
                 return -EINVAL;
         }
         if (!tfo->tpg_get_wwn) {
@@ -486,7 +492,7 @@ void target_unregister_template(const struct target_core_fabric_ops *fo)
 
         mutex_lock(&g_tf_lock);
         list_for_each_entry(t, &g_tf_list, tf_list) {
-                if (!strcmp(t->tf_ops->name, fo->name)) {
+                if (!strcmp(t->tf_ops->fabric_name, fo->fabric_name)) {
                         BUG_ON(atomic_read(&t->tf_access_cnt));
                         list_del(&t->tf_list);
                         mutex_unlock(&g_tf_lock);
@@ -532,9 +538,9 @@ DEF_CONFIGFS_ATTRIB_SHOW(emulate_tpu);
 DEF_CONFIGFS_ATTRIB_SHOW(emulate_tpws);
 DEF_CONFIGFS_ATTRIB_SHOW(emulate_caw);
 DEF_CONFIGFS_ATTRIB_SHOW(emulate_3pc);
+DEF_CONFIGFS_ATTRIB_SHOW(emulate_pr);
 DEF_CONFIGFS_ATTRIB_SHOW(pi_prot_type);
 DEF_CONFIGFS_ATTRIB_SHOW(hw_pi_prot_type);
-DEF_CONFIGFS_ATTRIB_SHOW(pi_prot_format);
 DEF_CONFIGFS_ATTRIB_SHOW(pi_prot_verify);
 DEF_CONFIGFS_ATTRIB_SHOW(enforce_pr_isids);
 DEF_CONFIGFS_ATTRIB_SHOW(is_nonrot);
@@ -592,6 +598,7 @@ static ssize_t _name##_store(struct config_item *item, const char *page,	\
 DEF_CONFIGFS_ATTRIB_STORE_BOOL(emulate_fua_write);
 DEF_CONFIGFS_ATTRIB_STORE_BOOL(emulate_caw);
 DEF_CONFIGFS_ATTRIB_STORE_BOOL(emulate_3pc);
+DEF_CONFIGFS_ATTRIB_STORE_BOOL(emulate_pr);
 DEF_CONFIGFS_ATTRIB_STORE_BOOL(enforce_pr_isids);
 DEF_CONFIGFS_ATTRIB_STORE_BOOL(is_nonrot);
 
@@ -613,12 +620,17 @@ static void dev_set_t10_wwn_model_alias(struct se_device *dev)
         const char *configname;
 
         configname = config_item_name(&dev->dev_group.cg_item);
-        if (strlen(configname) >= 16) {
+        if (strlen(configname) >= INQUIRY_MODEL_LEN) {
                 pr_warn("dev[%p]: Backstore name '%s' is too long for "
-                        "INQUIRY_MODEL, truncating to 16 bytes\n", dev,
+                        "INQUIRY_MODEL, truncating to 15 characters\n", dev,
                         configname);
         }
-        snprintf(&dev->t10_wwn.model[0], 16, "%s", configname);
+        /*
+         * XXX We can't use sizeof(dev->t10_wwn.model) (INQUIRY_MODEL_LEN + 1)
+         * here without potentially breaking existing setups, so continue to
+         * truncate one byte shorter than what can be carried in INQUIRY.
+         */
+        strlcpy(dev->t10_wwn.model, configname, INQUIRY_MODEL_LEN);
 }
 
 static ssize_t emulate_model_alias_store(struct config_item *item,
@@ -640,11 +652,12 @@ static ssize_t emulate_model_alias_store(struct config_item *item,
         if (ret < 0)
                 return ret;
 
+        BUILD_BUG_ON(sizeof(dev->t10_wwn.model) != INQUIRY_MODEL_LEN + 1);
         if (flag) {
                 dev_set_t10_wwn_model_alias(dev);
         } else {
-                strncpy(&dev->t10_wwn.model[0],
-                        dev->transport->inquiry_prod, 16);
+                strlcpy(dev->t10_wwn.model, dev->transport->inquiry_prod,
+                        sizeof(dev->t10_wwn.model));
         }
         da->emulate_model_alias = flag;
         return count;
@@ -1116,9 +1129,10 @@ CONFIGFS_ATTR(, emulate_tpu);
 CONFIGFS_ATTR(, emulate_tpws);
 CONFIGFS_ATTR(, emulate_caw);
 CONFIGFS_ATTR(, emulate_3pc);
+CONFIGFS_ATTR(, emulate_pr);
 CONFIGFS_ATTR(, pi_prot_type);
 CONFIGFS_ATTR_RO(, hw_pi_prot_type);
-CONFIGFS_ATTR(, pi_prot_format);
+CONFIGFS_ATTR_WO(, pi_prot_format);
 CONFIGFS_ATTR(, pi_prot_verify);
 CONFIGFS_ATTR(, enforce_pr_isids);
 CONFIGFS_ATTR(, is_nonrot);
@@ -1156,6 +1170,7 @@ struct configfs_attribute *sbc_attrib_attrs[] = {
         &attr_emulate_tpws,
         &attr_emulate_caw,
         &attr_emulate_3pc,
+        &attr_emulate_pr,
         &attr_pi_prot_type,
         &attr_hw_pi_prot_type,
         &attr_pi_prot_format,
@@ -1211,6 +1226,74 @@ static struct t10_wwn *to_t10_wwn(struct config_item *item)
 }
 
 /*
+ * STANDARD and VPD page 0x83 T10 Vendor Identification
+ */
+static ssize_t target_wwn_vendor_id_show(struct config_item *item,
+                char *page)
+{
+        return sprintf(page, "%s\n", &to_t10_wwn(item)->vendor[0]);
+}
+
+static ssize_t target_wwn_vendor_id_store(struct config_item *item,
+                const char *page, size_t count)
+{
+        struct t10_wwn *t10_wwn = to_t10_wwn(item);
+        struct se_device *dev = t10_wwn->t10_dev;
+        /* +2 to allow for a trailing (stripped) '\n' and null-terminator */
+        unsigned char buf[INQUIRY_VENDOR_LEN + 2];
+        char *stripped = NULL;
+        size_t len;
+        int i;
+
+        len = strlcpy(buf, page, sizeof(buf));
+        if (len < sizeof(buf)) {
+                /* Strip any newline added from userspace. */
+                stripped = strstrip(buf);
+                len = strlen(stripped);
+        }
+        if (len > INQUIRY_VENDOR_LEN) {
+                pr_err("Emulated T10 Vendor Identification exceeds"
+                        " INQUIRY_VENDOR_LEN: " __stringify(INQUIRY_VENDOR_LEN)
+                        "\n");
+                return -EOVERFLOW;
+        }
+
+        /*
+         * SPC 4.3.1:
+         * ASCII data fields shall contain only ASCII printable characters (i.e.,
+         * code values 20h to 7Eh) and may be terminated with one or more ASCII
+         * null (00h) characters.
+         */
+        for (i = 0; i < len; i++) {
+                if ((stripped[i] < 0x20) || (stripped[i] > 0x7E)) {
+                        pr_err("Emulated T10 Vendor Identification contains"
+                                " non-ASCII-printable characters\n");
+                        return -EINVAL;
+                }
+        }
+
+        /*
+         * Check to see if any active exports exist.  If they do exist, fail
+         * here as changing this information on the fly (underneath the
+         * initiator side OS dependent multipath code) could cause negative
+         * effects.
+         */
+        if (dev->export_count) {
+                pr_err("Unable to set T10 Vendor Identification while"
+                        " active %d exports exist\n", dev->export_count);
+                return -EINVAL;
+        }
+
+        BUILD_BUG_ON(sizeof(dev->t10_wwn.vendor) != INQUIRY_VENDOR_LEN + 1);
+        strlcpy(dev->t10_wwn.vendor, stripped, sizeof(dev->t10_wwn.vendor));
+
+        pr_debug("Target_Core_ConfigFS: Set emulated T10 Vendor Identification:"
+                 " %s\n", dev->t10_wwn.vendor);
+
+        return count;
+}
+
+/*
  * VPD page 0x80 Unit serial
  */
 static ssize_t target_wwn_vpd_unit_serial_show(struct config_item *item,
@@ -1356,6 +1439,7 @@ DEF_DEV_WWN_ASSOC_SHOW(vpd_assoc_target_port, 0x10);
 /* VPD page 0x83 Association: SCSI Target Device */
 DEF_DEV_WWN_ASSOC_SHOW(vpd_assoc_scsi_target_device, 0x20);
 
+CONFIGFS_ATTR(target_wwn_, vendor_id);
 CONFIGFS_ATTR(target_wwn_, vpd_unit_serial);
 CONFIGFS_ATTR_RO(target_wwn_, vpd_protocol_identifier);
 CONFIGFS_ATTR_RO(target_wwn_, vpd_assoc_logical_unit);
@@ -1363,6 +1447,7 @@ CONFIGFS_ATTR_RO(target_wwn_, vpd_assoc_target_port);
 CONFIGFS_ATTR_RO(target_wwn_, vpd_assoc_scsi_target_device);
 
 static struct configfs_attribute *target_core_dev_wwn_attrs[] = {
+        &target_wwn_attr_vendor_id,
         &target_wwn_attr_vpd_unit_serial,
         &target_wwn_attr_vpd_protocol_identifier,
         &target_wwn_attr_vpd_assoc_logical_unit,
@@ -1400,7 +1485,7 @@ static ssize_t target_core_dev_pr_show_spc3_res(struct se_device *dev,
         core_pr_dump_initiator_port(pr_reg, i_buf, PR_REG_ISID_ID_LEN);
 
         return sprintf(page, "SPC-3 Reservation: %s Initiator: %s%s\n",
-                se_nacl->se_tpg->se_tpg_tfo->get_fabric_name(),
+                se_nacl->se_tpg->se_tpg_tfo->fabric_name,
                 se_nacl->initiatorname, i_buf);
 }
 
@@ -1414,7 +1499,7 @@ static ssize_t target_core_dev_pr_show_spc2_res(struct se_device *dev,
         if (se_nacl) {
                 len = sprintf(page,
                               "SPC-2 Reservation: %s Initiator: %s\n",
-                              se_nacl->se_tpg->se_tpg_tfo->get_fabric_name(),
+                              se_nacl->se_tpg->se_tpg_tfo->fabric_name,
                               se_nacl->initiatorname);
         } else {
                 len = sprintf(page, "No SPC-2 Reservation holder\n");
@@ -1427,6 +1512,9 @@ static ssize_t target_pr_res_holder_show(struct config_item *item, char *page)
         struct se_device *dev = pr_to_dev(item);
         int ret;
 
+        if (!dev->dev_attrib.emulate_pr)
+                return sprintf(page, "SPC_RESERVATIONS_DISABLED\n");
+
         if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)
                 return sprintf(page, "Passthrough\n");
 
@@ -1489,13 +1577,13 @@ static ssize_t target_pr_res_pr_holder_tg_port_show(struct config_item *item,
         tfo = se_tpg->se_tpg_tfo;
 
         len += sprintf(page+len, "SPC-3 Reservation: %s"
-                " Target Node Endpoint: %s\n", tfo->get_fabric_name(),
+                " Target Node Endpoint: %s\n", tfo->fabric_name,
                 tfo->tpg_get_wwn(se_tpg));
         len += sprintf(page+len, "SPC-3 Reservation: Relative Port"
                 " Identifier Tag: %hu %s Portal Group Tag: %hu"
                 " %s Logical Unit: %llu\n", pr_reg->tg_pt_sep_rtpi,
-                tfo->get_fabric_name(), tfo->tpg_get_tag(se_tpg),
-                tfo->get_fabric_name(), pr_reg->pr_aptpl_target_lun);
+                tfo->fabric_name, tfo->tpg_get_tag(se_tpg),
+                tfo->fabric_name, pr_reg->pr_aptpl_target_lun);
 
 out_unlock:
         spin_unlock(&dev->dev_reservation_lock);
@@ -1526,7 +1614,7 @@ static ssize_t target_pr_res_pr_registered_i_pts_show(struct config_item *item,
                 core_pr_dump_initiator_port(pr_reg, i_buf,
                                         PR_REG_ISID_ID_LEN);
                 sprintf(buf, "%s Node: %s%s Key: 0x%016Lx PRgen: 0x%08x\n",
-                        tfo->get_fabric_name(),
+                        tfo->fabric_name,
                         pr_reg->pr_reg_nacl->initiatorname, i_buf, pr_reg->pr_res_key,
                         pr_reg->pr_res_generation);
 
@@ -1567,12 +1655,14 @@ static ssize_t target_pr_res_type_show(struct config_item *item, char *page)
 {
         struct se_device *dev = pr_to_dev(item);
 
+        if (!dev->dev_attrib.emulate_pr)
+                return sprintf(page, "SPC_RESERVATIONS_DISABLED\n");
         if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)
                 return sprintf(page, "SPC_PASSTHROUGH\n");
-        else if (dev->dev_reservation_flags & DRF_SPC2_RESERVATIONS)
+        if (dev->dev_reservation_flags & DRF_SPC2_RESERVATIONS)
                 return sprintf(page, "SPC2_RESERVATIONS\n");
-        else
-                return sprintf(page, "SPC3_PERSISTENT_RESERVATIONS\n");
+
+        return sprintf(page, "SPC3_PERSISTENT_RESERVATIONS\n");
 }
 
 static ssize_t target_pr_res_aptpl_active_show(struct config_item *item,
@@ -1580,7 +1670,8 @@ static ssize_t target_pr_res_aptpl_active_show(struct config_item *item,
 {
         struct se_device *dev = pr_to_dev(item);
 
-        if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)
+        if (!dev->dev_attrib.emulate_pr ||
+            (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR))
                 return 0;
 
         return sprintf(page, "APTPL Bit Status: %s\n",
@@ -1592,7 +1683,8 @@ static ssize_t target_pr_res_aptpl_metadata_show(struct config_item *item,
 {
         struct se_device *dev = pr_to_dev(item);
 
-        if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)
+        if (!dev->dev_attrib.emulate_pr ||
+            (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR))
                 return 0;
 
         return sprintf(page, "Ready to process PR APTPL metadata..\n");
@@ -1638,7 +1730,8 @@ static ssize_t target_pr_res_aptpl_metadata_store(struct config_item *item,
         u16 tpgt = 0;
         u8 type = 0;
 
-        if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)
+        if (!dev->dev_attrib.emulate_pr ||
+            (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR))
                 return count;
         if (dev->dev_reservation_flags & DRF_SPC2_RESERVATIONS)
                 return count;
@@ -2746,7 +2839,7 @@ static ssize_t target_tg_pt_gp_members_show(struct config_item *item,
                 struct se_portal_group *tpg = lun->lun_tpg;
 
                 cur_len = snprintf(buf, TG_PT_GROUP_NAME_BUF, "%s/%s/tpgt_%hu"
-                        "/%s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                        "/%s\n", tpg->se_tpg_tfo->fabric_name,
                         tpg->se_tpg_tfo->tpg_get_wwn(tpg),
                         tpg->se_tpg_tfo->tpg_get_tag(tpg),
                         config_item_name(&lun->lun_group.cg_item));
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 47b5ef153135..93c56f4a9911 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -95,7 +95,7 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd, u64 unpacked_lun)
                     deve->lun_access_ro) {
                         pr_err("TARGET_CORE[%s]: Detected WRITE_PROTECTED LUN"
                                 " Access for 0x%08llx\n",
-                                se_cmd->se_tfo->get_fabric_name(),
+                                se_cmd->se_tfo->fabric_name,
                                 unpacked_lun);
                         rcu_read_unlock();
                         ret = TCM_WRITE_PROTECTED;
@@ -114,7 +114,7 @@ out_unlock:
                 if (unpacked_lun != 0) {
                         pr_err("TARGET_CORE[%s]: Detected NON_EXISTENT_LUN"
                                 " Access for 0x%08llx\n",
-                                se_cmd->se_tfo->get_fabric_name(),
+                                se_cmd->se_tfo->fabric_name,
                                 unpacked_lun);
                         return TCM_NON_EXISTENT_LUN;
                 }
@@ -188,7 +188,7 @@ out_unlock:
         if (!se_lun) {
                 pr_debug("TARGET_CORE[%s]: Detected NON_EXISTENT_LUN"
                         " Access for 0x%08llx\n",
-                        se_cmd->se_tfo->get_fabric_name(),
+                        se_cmd->se_tfo->fabric_name,
                         unpacked_lun);
                 return -ENODEV;
         }
@@ -237,7 +237,7 @@ struct se_dev_entry *core_get_se_deve_from_rtpi(
                 if (!lun) {
                         pr_err("%s device entries device pointer is"
                                 " NULL, but Initiator has access.\n",
-                                tpg->se_tpg_tfo->get_fabric_name());
+                                tpg->se_tpg_tfo->fabric_name);
                         continue;
                 }
                 if (lun->lun_rtpi != rtpi)
@@ -571,9 +571,9 @@ int core_dev_add_lun(
                 return rc;
 
         pr_debug("%s_TPG[%u]_LUN[%llu] - Activated %s Logical Unit from"
-                " CORE HBA: %u\n", tpg->se_tpg_tfo->get_fabric_name(),
+                " CORE HBA: %u\n", tpg->se_tpg_tfo->fabric_name,
                 tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
-                tpg->se_tpg_tfo->get_fabric_name(), dev->se_hba->hba_id);
+                tpg->se_tpg_tfo->fabric_name, dev->se_hba->hba_id);
         /*
          * Update LUN maps for dynamically added initiators when
          * generate_node_acl is enabled.
@@ -604,9 +604,9 @@ void core_dev_del_lun(
         struct se_lun *lun)
 {
         pr_debug("%s_TPG[%u]_LUN[%llu] - Deactivating %s Logical Unit from"
-                " device object\n", tpg->se_tpg_tfo->get_fabric_name(),
+                " device object\n", tpg->se_tpg_tfo->fabric_name,
                 tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
-                tpg->se_tpg_tfo->get_fabric_name());
+                tpg->se_tpg_tfo->fabric_name);
 
         core_tpg_remove_lun(tpg, lun);
 }
@@ -621,7 +621,7 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
 
         if (strlen(nacl->initiatorname) >= TRANSPORT_IQN_LEN) {
                 pr_err("%s InitiatorName exceeds maximum size.\n",
-                        tpg->se_tpg_tfo->get_fabric_name());
+                        tpg->se_tpg_tfo->fabric_name);
                 *ret = -EOVERFLOW;
                 return NULL;
         }
@@ -664,7 +664,7 @@ int core_dev_add_initiator_node_lun_acl(
                 return -EINVAL;
 
         pr_debug("%s_TPG[%hu]_LUN[%llu->%llu] - Added %s ACL for "
-                " InitiatorNode: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                " InitiatorNode: %s\n", tpg->se_tpg_tfo->fabric_name,
                 tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun, lacl->mapped_lun,
                 lun_access_ro ? "RO" : "RW",
                 nacl->initiatorname);
@@ -697,7 +697,7 @@ int core_dev_del_initiator_node_lun_acl(
 
         pr_debug("%s_TPG[%hu]_LUN[%llu] - Removed ACL for"
                 " InitiatorNode: %s Mapped LUN: %llu\n",
-                tpg->se_tpg_tfo->get_fabric_name(),
+                tpg->se_tpg_tfo->fabric_name,
                 tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
                 nacl->initiatorname, lacl->mapped_lun);
 
@@ -709,9 +709,9 @@ void core_dev_free_initiator_node_lun_acl(
         struct se_lun_acl *lacl)
 {
         pr_debug("%s_TPG[%hu] - Freeing ACL for %s InitiatorNode: %s"
-                " Mapped LUN: %llu\n", tpg->se_tpg_tfo->get_fabric_name(),
+                " Mapped LUN: %llu\n", tpg->se_tpg_tfo->fabric_name,
                 tpg->se_tpg_tfo->tpg_get_tag(tpg),
-                tpg->se_tpg_tfo->get_fabric_name(),
+                tpg->se_tpg_tfo->fabric_name,
                 lacl->se_lun_nacl->initiatorname, lacl->mapped_lun);
 
         kfree(lacl);
@@ -720,36 +720,17 @@ void core_dev_free_initiator_node_lun_acl(
 static void scsi_dump_inquiry(struct se_device *dev)
 {
         struct t10_wwn *wwn = &dev->t10_wwn;
-        char buf[17];
-        int i, device_type;
+        int device_type = dev->transport->get_device_type(dev);
+
         /*
          * Print Linux/SCSI style INQUIRY formatting to the kernel ring buffer
          */
-        for (i = 0; i < 8; i++)
-                if (wwn->vendor[i] >= 0x20)
-                        buf[i] = wwn->vendor[i];
-                else
-                        buf[i] = ' ';
-        buf[i] = '\0';
-        pr_debug("  Vendor: %s\n", buf);
-
-        for (i = 0; i < 16; i++)
-                if (wwn->model[i] >= 0x20)
-                        buf[i] = wwn->model[i];
-                else
-                        buf[i] = ' ';
-        buf[i] = '\0';
-        pr_debug("  Model: %s\n", buf);
-
-        for (i = 0; i < 4; i++)
-                if (wwn->revision[i] >= 0x20)
-                        buf[i] = wwn->revision[i];
-                else
-                        buf[i] = ' ';
-        buf[i] = '\0';
-        pr_debug("  Revision: %s\n", buf);
-
-        device_type = dev->transport->get_device_type(dev);
+        pr_debug("  Vendor: %-" __stringify(INQUIRY_VENDOR_LEN) "s\n",
+                wwn->vendor);
+        pr_debug("  Model: %-" __stringify(INQUIRY_MODEL_LEN) "s\n",
+                wwn->model);
+        pr_debug("  Revision: %-" __stringify(INQUIRY_REVISION_LEN) "s\n",
+                wwn->revision);
         pr_debug("  Type:   %s ", scsi_device_type(device_type));
 }
 
@@ -805,6 +786,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
         dev->dev_attrib.emulate_tpws = DA_EMULATE_TPWS;
         dev->dev_attrib.emulate_caw = DA_EMULATE_CAW;
         dev->dev_attrib.emulate_3pc = DA_EMULATE_3PC;
+        dev->dev_attrib.emulate_pr = DA_EMULATE_PR;
         dev->dev_attrib.pi_prot_type = TARGET_DIF_TYPE0_PROT;
         dev->dev_attrib.enforce_pr_isids = DA_ENFORCE_PR_ISIDS;
         dev->dev_attrib.force_pr_aptpl = DA_FORCE_PR_APTPL;
@@ -822,13 +804,19 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
 
         xcopy_lun = &dev->xcopy_lun;
         rcu_assign_pointer(xcopy_lun->lun_se_dev, dev);
-        init_completion(&xcopy_lun->lun_ref_comp);
         init_completion(&xcopy_lun->lun_shutdown_comp);
         INIT_LIST_HEAD(&xcopy_lun->lun_deve_list);
         INIT_LIST_HEAD(&xcopy_lun->lun_dev_link);
         mutex_init(&xcopy_lun->lun_tg_pt_md_mutex);
         xcopy_lun->lun_tpg = &xcopy_pt_tpg;
 
+        /* Preload the default INQUIRY const values */
+        strlcpy(dev->t10_wwn.vendor, "LIO-ORG", sizeof(dev->t10_wwn.vendor));
+        strlcpy(dev->t10_wwn.model, dev->transport->inquiry_prod,
+                sizeof(dev->t10_wwn.model));
+        strlcpy(dev->t10_wwn.revision, dev->transport->inquiry_rev,
+                sizeof(dev->t10_wwn.revision));
+
         return dev;
 }
 
@@ -987,35 +975,10 @@ int target_configure_device(struct se_device *dev)
                 goto out_destroy_device;
 
         /*
-         * Startup the struct se_device processing thread
-         */
-        dev->tmr_wq = alloc_workqueue("tmr-%s", WQ_MEM_RECLAIM | WQ_UNBOUND, 1,
-                                      dev->transport->name);
-        if (!dev->tmr_wq) {
-                pr_err("Unable to create tmr workqueue for %s\n",
-                        dev->transport->name);
-                ret = -ENOMEM;
-                goto out_free_alua;
-        }
-
-        /*
          * Setup work_queue for QUEUE_FULL
          */
         INIT_WORK(&dev->qf_work_queue, target_qf_do_work);
 
-        /*
-         * Preload the initial INQUIRY const values if we are doing
-         * anything virtual (IBLOCK, FILEIO, RAMDISK), but not for TCM/pSCSI
-         * passthrough because this is being provided by the backend LLD.
-         */
-        if (!(dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)) {
-                strncpy(&dev->t10_wwn.vendor[0], "LIO-ORG", 8);
-                strncpy(&dev->t10_wwn.model[0],
-                        dev->transport->inquiry_prod, 16);
-                strncpy(&dev->t10_wwn.revision[0],
-                        dev->transport->inquiry_rev, 4);
-        }
-
         scsi_dump_inquiry(dev);
 
         spin_lock(&hba->device_lock);
@@ -1026,8 +989,6 @@ int target_configure_device(struct se_device *dev)
 
         return 0;
 
-out_free_alua:
-        core_alua_free_lu_gp_mem(dev);
 out_destroy_device:
         dev->transport->destroy_device(dev);
 out_free_index:
@@ -1046,8 +1007,6 @@ void target_free_device(struct se_device *dev)
         WARN_ON(!list_empty(&dev->dev_sep_list));
 
         if (target_dev_configured(dev)) {
-                destroy_workqueue(dev->tmr_wq);
-
                 dev->transport->destroy_device(dev);
 
                 mutex_lock(&device_mutex);
@@ -1159,6 +1118,18 @@ passthrough_parse_cdb(struct se_cmd *cmd,
         }
 
         /*
+         * With emulate_pr disabled, all reservation requests should fail,
+         * regardless of whether or not TRANSPORT_FLAG_PASSTHROUGH_PGR is set.
+         */
+        if (!dev->dev_attrib.emulate_pr &&
+            ((cdb[0] == PERSISTENT_RESERVE_IN) ||
+             (cdb[0] == PERSISTENT_RESERVE_OUT) ||
+             (cdb[0] == RELEASE || cdb[0] == RELEASE_10) ||
+             (cdb[0] == RESERVE || cdb[0] == RESERVE_10))) {
+                return TCM_UNSUPPORTED_SCSI_OPCODE;
+        }
+
+        /*
          * For PERSISTENT RESERVE IN/OUT, RELEASE, and RESERVE we need to
          * emulate the response, since tcmu does not have the information
          * required to process these commands.
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index aa2f4f632ebe..9a6e20a2af7d 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -203,7 +203,7 @@ static ssize_t target_fabric_mappedlun_write_protect_store(
 
         pr_debug("%s_ConfigFS: Changed Initiator ACL: %s"
                 " Mapped LUN: %llu Write Protect bit to %s\n",
-                se_tpg->se_tpg_tfo->get_fabric_name(),
+                se_tpg->se_tpg_tfo->fabric_name,
                 se_nacl->initiatorname, lacl->mapped_lun, (wp) ? "ON" : "OFF");
 
         return count;
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index 0c6635587930..853344415963 100644
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -138,7 +138,6 @@ int	init_se_kmem_caches(void);
 void    release_se_kmem_caches(void);
 u32     scsi_get_new_index(scsi_index_t);
 void    transport_subsystem_check_init(void);
-int     transport_cmd_finish_abort(struct se_cmd *);
 unsigned char *transport_dump_cmd_direction(struct se_cmd *);
 void    transport_dump_dev_state(struct se_device *, char *, int *);
 void    transport_dump_dev_info(struct se_device *, struct se_lun *,
@@ -148,7 +147,6 @@ int	transport_dump_vpd_assoc(struct t10_vpd *, unsigned char *, int);
 int     transport_dump_vpd_ident_type(struct t10_vpd *, unsigned char *, int);
 int     transport_dump_vpd_ident(struct t10_vpd *, unsigned char *, int);
 void    transport_clear_lun_ref(struct se_lun *);
-void    transport_send_task_abort(struct se_cmd *);
 sense_reason_t  target_cmd_size_check(struct se_cmd *cmd, unsigned int size);
 void    target_qf_do_work(struct work_struct *work);
 bool    target_check_wce(struct se_device *dev);
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 10db5656fd5d..397f38cb7f4e 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -235,7 +235,7 @@ target_scsi2_reservation_release(struct se_cmd *cmd)
         tpg = sess->se_tpg;
         pr_debug("SCSI-2 Released reservation for %s LUN: %llu ->"
                 " MAPPED LUN: %llu for %s\n",
-                tpg->se_tpg_tfo->get_fabric_name(),
+                tpg->se_tpg_tfo->fabric_name,
                 cmd->se_lun->unpacked_lun, cmd->orig_fe_lun,
                 sess->se_node_acl->initiatorname);
 
@@ -278,7 +278,7 @@ target_scsi2_reservation_reserve(struct se_cmd *cmd)
         if (dev->dev_reserved_node_acl &&
            (dev->dev_reserved_node_acl != sess->se_node_acl)) {
                 pr_err("SCSI-2 RESERVATION CONFLIFT for %s fabric\n",
-                        tpg->se_tpg_tfo->get_fabric_name());
+                        tpg->se_tpg_tfo->fabric_name);
                 pr_err("Original reserver LUN: %llu %s\n",
                         cmd->se_lun->unpacked_lun,
                         dev->dev_reserved_node_acl->initiatorname);
@@ -297,7 +297,7 @@ target_scsi2_reservation_reserve(struct se_cmd *cmd)
                 dev->dev_reservation_flags |= DRF_SPC2_RESERVATIONS_WITH_ISID;
         }
         pr_debug("SCSI-2 Reserved %s LUN: %llu -> MAPPED LUN: %llu"
-                " for %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                " for %s\n", tpg->se_tpg_tfo->fabric_name,
                 cmd->se_lun->unpacked_lun, cmd->orig_fe_lun,
                 sess->se_node_acl->initiatorname);
 
@@ -914,11 +914,11 @@ static void core_scsi3_aptpl_reserve(
 
         pr_debug("SPC-3 PR [%s] Service Action: APTPL RESERVE created"
                 " new reservation holder TYPE: %s ALL_TG_PT: %d\n",
-                tpg->se_tpg_tfo->get_fabric_name(),
+                tpg->se_tpg_tfo->fabric_name,
                 core_scsi3_pr_dump_type(pr_reg->pr_res_type),
                 (pr_reg->pr_reg_all_tg_pt) ? 1 : 0);
         pr_debug("SPC-3 PR [%s] RESERVE Node: %s%s\n",
-                tpg->se_tpg_tfo->get_fabric_name(), node_acl->initiatorname,
+                tpg->se_tpg_tfo->fabric_name, node_acl->initiatorname,
                 i_buf);
 }
 
@@ -1036,19 +1036,19 @@ static void __core_scsi3_dump_registration(
         core_pr_dump_initiator_port(pr_reg, i_buf, PR_REG_ISID_ID_LEN);
 
         pr_debug("SPC-3 PR [%s] Service Action: REGISTER%s Initiator"
-                " Node: %s%s\n", tfo->get_fabric_name(), (register_type == REGISTER_AND_MOVE) ?
+                " Node: %s%s\n", tfo->fabric_name, (register_type == REGISTER_AND_MOVE) ?
                 "_AND_MOVE" : (register_type == REGISTER_AND_IGNORE_EXISTING_KEY) ?
                 "_AND_IGNORE_EXISTING_KEY" : "", nacl->initiatorname,
                 i_buf);
         pr_debug("SPC-3 PR [%s] registration on Target Port: %s,0x%04x\n",
-                 tfo->get_fabric_name(), tfo->tpg_get_wwn(se_tpg),
+                 tfo->fabric_name, tfo->tpg_get_wwn(se_tpg),
                 tfo->tpg_get_tag(se_tpg));
         pr_debug("SPC-3 PR [%s] for %s TCM Subsystem %s Object Target"
-                " Port(s)\n",  tfo->get_fabric_name(),
+                " Port(s)\n",  tfo->fabric_name,
                 (pr_reg->pr_reg_all_tg_pt) ? "ALL" : "SINGLE",
                 dev->transport->name);
         pr_debug("SPC-3 PR [%s] SA Res Key: 0x%016Lx PRgeneration:"
-                " 0x%08x  APTPL: %d\n", tfo->get_fabric_name(),
+                " 0x%08x  APTPL: %d\n", tfo->fabric_name,
                 pr_reg->pr_res_key, pr_reg->pr_res_generation,
                 pr_reg->pr_reg_aptpl);
 }
@@ -1329,7 +1329,7 @@ static void __core_scsi3_free_registration(
          */
         while (atomic_read(&pr_reg->pr_res_holders) != 0) {
                 pr_debug("SPC-3 PR [%s] waiting for pr_res_holders\n",
-                                tfo->get_fabric_name());
+                                tfo->fabric_name);
                 cpu_relax();
         }
 
@@ -1341,15 +1341,15 @@ static void __core_scsi3_free_registration(
 
         spin_lock(&pr_tmpl->registration_lock);
         pr_debug("SPC-3 PR [%s] Service Action: UNREGISTER Initiator"
-                " Node: %s%s\n", tfo->get_fabric_name(),
+                " Node: %s%s\n", tfo->fabric_name,
                 pr_reg->pr_reg_nacl->initiatorname,
                 i_buf);
         pr_debug("SPC-3 PR [%s] for %s TCM Subsystem %s Object Target"
-                " Port(s)\n", tfo->get_fabric_name(),
+                " Port(s)\n", tfo->fabric_name,
                 (pr_reg->pr_reg_all_tg_pt) ? "ALL" : "SINGLE",
                 dev->transport->name);
         pr_debug("SPC-3 PR [%s] SA Res Key: 0x%016Lx PRgeneration:"
-                " 0x%08x\n", tfo->get_fabric_name(), pr_reg->pr_res_key,
+                " 0x%08x\n", tfo->fabric_name, pr_reg->pr_res_key,
                 pr_reg->pr_res_generation);
 
         if (!preempt_and_abort_list) {
@@ -1645,7 +1645,7 @@ core_scsi3_decode_spec_i_port(
                         dest_tpg = tmp_tpg;
                         pr_debug("SPC-3 PR SPEC_I_PT: Located %s Node:"
                                 " %s Port RTPI: %hu\n",
-                                dest_tpg->se_tpg_tfo->get_fabric_name(),
+                                dest_tpg->se_tpg_tfo->fabric_name,
                                 dest_node_acl->initiatorname, dest_rtpi);
 
                         spin_lock(&dev->se_port_lock);
@@ -1662,7 +1662,7 @@ core_scsi3_decode_spec_i_port(
 
                 pr_debug("SPC-3 PR SPEC_I_PT: Got %s data_length: %u tpdl: %u"
                         " tid_len: %d for %s + %s\n",
-                        dest_tpg->se_tpg_tfo->get_fabric_name(), cmd->data_length,
+                        dest_tpg->se_tpg_tfo->fabric_name, cmd->data_length,
                         tpdl, tid_len, i_str, iport_ptr);
 
                 if (tid_len > tpdl) {
@@ -1683,7 +1683,7 @@ core_scsi3_decode_spec_i_port(
                 if (!dest_se_deve) {
                         pr_err("Unable to locate %s dest_se_deve"
                                 " from destination RTPI: %hu\n",
-                                dest_tpg->se_tpg_tfo->get_fabric_name(),
+                                dest_tpg->se_tpg_tfo->fabric_name,
                                 dest_rtpi);
 
                         core_scsi3_nodeacl_undepend_item(dest_node_acl);
@@ -1704,7 +1704,7 @@ core_scsi3_decode_spec_i_port(
 
                 pr_debug("SPC-3 PR SPEC_I_PT: Located %s Node: %s"
                         " dest_se_deve mapped_lun: %llu\n",
-                        dest_tpg->se_tpg_tfo->get_fabric_name(),
+                        dest_tpg->se_tpg_tfo->fabric_name,
                         dest_node_acl->initiatorname, dest_se_deve->mapped_lun);
 
                 /*
@@ -1815,7 +1815,7 @@ core_scsi3_decode_spec_i_port(
 
                 pr_debug("SPC-3 PR [%s] SPEC_I_PT: Successfully"
                         " registered Transport ID for Node: %s%s Mapped LUN:"
-                        " %llu\n", dest_tpg->se_tpg_tfo->get_fabric_name(),
+                        " %llu\n", dest_tpg->se_tpg_tfo->fabric_name,
                         dest_node_acl->initiatorname, i_buf, (dest_se_deve) ?
                         dest_se_deve->mapped_lun : 0);
 
@@ -1913,7 +1913,7 @@ static int core_scsi3_update_aptpl_buf(
                                 "res_holder=1\nres_type=%02x\n"
                                 "res_scope=%02x\nres_all_tg_pt=%d\n"
                                 "mapped_lun=%llu\n", reg_count,
-                                tpg->se_tpg_tfo->get_fabric_name(),
+                                tpg->se_tpg_tfo->fabric_name,
                                 pr_reg->pr_reg_nacl->initiatorname, isid_buf,
                                 pr_reg->pr_res_key, pr_reg->pr_res_type,
                                 pr_reg->pr_res_scope, pr_reg->pr_reg_all_tg_pt,
@@ -1923,7 +1923,7 @@ static int core_scsi3_update_aptpl_buf(
                                 "initiator_fabric=%s\ninitiator_node=%s\n%s"
                                 "sa_res_key=%llu\nres_holder=0\n"
                                 "res_all_tg_pt=%d\nmapped_lun=%llu\n",
-                                reg_count, tpg->se_tpg_tfo->get_fabric_name(),
+                                reg_count, tpg->se_tpg_tfo->fabric_name,
                                 pr_reg->pr_reg_nacl->initiatorname, isid_buf,
                                 pr_reg->pr_res_key, pr_reg->pr_reg_all_tg_pt,
                                 pr_reg->pr_res_mapped_lun);
@@ -1942,7 +1942,7 @@ static int core_scsi3_update_aptpl_buf(
                  */
                 snprintf(tmp, 512, "target_fabric=%s\ntarget_node=%s\n"
                         "tpgt=%hu\nport_rtpi=%hu\ntarget_lun=%llu\nPR_REG_END:"
-                        " %d\n", tpg->se_tpg_tfo->get_fabric_name(),
+                        " %d\n", tpg->se_tpg_tfo->fabric_name,
                         tpg->se_tpg_tfo->tpg_get_wwn(tpg),
                         tpg->se_tpg_tfo->tpg_get_tag(tpg),
                         pr_reg->tg_pt_sep_rtpi, pr_reg->pr_aptpl_target_lun,
@@ -2168,7 +2168,7 @@ core_scsi3_emulate_pro_register(struct se_cmd *cmd, u64 res_key, u64 sa_res_key,
                 pr_reg->pr_res_key = sa_res_key;
                 pr_debug("SPC-3 PR [%s] REGISTER%s: Changed Reservation"
                          " Key for %s to: 0x%016Lx PRgeneration:"
-                         " 0x%08x\n", cmd->se_tfo->get_fabric_name(),
+                         " 0x%08x\n", cmd->se_tfo->fabric_name,
                          (register_type == REGISTER_AND_IGNORE_EXISTING_KEY) ? "_AND_IGNORE_EXISTING_KEY" : "",
                          pr_reg->pr_reg_nacl->initiatorname,
                          pr_reg->pr_res_key, pr_reg->pr_res_generation);
@@ -2356,9 +2356,9 @@ core_scsi3_pro_reserve(struct se_cmd *cmd, int type, int scope, u64 res_key)
                         pr_err("SPC-3 PR: Attempted RESERVE from"
                                 " [%s]: %s while reservation already held by"
                                 " [%s]: %s, returning RESERVATION_CONFLICT\n",
-                                cmd->se_tfo->get_fabric_name(),
+                                cmd->se_tfo->fabric_name,
                                 se_sess->se_node_acl->initiatorname,
-                                pr_res_nacl->se_tpg->se_tpg_tfo->get_fabric_name(),
+                                pr_res_nacl->se_tpg->se_tpg_tfo->fabric_name,
                                 pr_res_holder->pr_reg_nacl->initiatorname);
 
                         spin_unlock(&dev->dev_reservation_lock);
@@ -2379,9 +2379,9 @@ core_scsi3_pro_reserve(struct se_cmd *cmd, int type, int scope, u64 res_key)
                                 " [%s]: %s trying to change TYPE and/or SCOPE,"
                                 " while reservation already held by [%s]: %s,"
                                 " returning RESERVATION_CONFLICT\n",
-                                cmd->se_tfo->get_fabric_name(),
+                                cmd->se_tfo->fabric_name,
                                 se_sess->se_node_acl->initiatorname,
-                                pr_res_nacl->se_tpg->se_tpg_tfo->get_fabric_name(),
+                                pr_res_nacl->se_tpg->se_tpg_tfo->fabric_name,
                                 pr_res_holder->pr_reg_nacl->initiatorname);
 
                         spin_unlock(&dev->dev_reservation_lock);
@@ -2414,10 +2414,10 @@ core_scsi3_pro_reserve(struct se_cmd *cmd, int type, int scope, u64 res_key)
 
         pr_debug("SPC-3 PR [%s] Service Action: RESERVE created new"
                 " reservation holder TYPE: %s ALL_TG_PT: %d\n",
-                cmd->se_tfo->get_fabric_name(), core_scsi3_pr_dump_type(type),
+                cmd->se_tfo->fabric_name, core_scsi3_pr_dump_type(type),
                 (pr_reg->pr_reg_all_tg_pt) ? 1 : 0);
         pr_debug("SPC-3 PR [%s] RESERVE Node: %s%s\n",
-                        cmd->se_tfo->get_fabric_name(),
+                        cmd->se_tfo->fabric_name,
                         se_sess->se_node_acl->initiatorname,
                         i_buf);
         spin_unlock(&dev->dev_reservation_lock);
@@ -2506,12 +2506,12 @@ out:
         if (!dev->dev_pr_res_holder) {
                 pr_debug("SPC-3 PR [%s] Service Action: %s RELEASE cleared"
                         " reservation holder TYPE: %s ALL_TG_PT: %d\n",
-                        tfo->get_fabric_name(), (explicit) ? "explicit" :
+                        tfo->fabric_name, (explicit) ? "explicit" :
                         "implicit", core_scsi3_pr_dump_type(pr_res_type),
                         (pr_reg->pr_reg_all_tg_pt) ? 1 : 0);
         }
         pr_debug("SPC-3 PR [%s] RELEASE Node: %s%s\n",
-                tfo->get_fabric_name(), se_nacl->initiatorname,
+                tfo->fabric_name, se_nacl->initiatorname,
                 i_buf);
         /*
          * Clear TYPE and SCOPE for the next PROUT Service Action: RESERVE
@@ -2609,9 +2609,9 @@ core_scsi3_emulate_pro_release(struct se_cmd *cmd, int type, int scope,
                         " reservation from [%s]: %s with different TYPE "
                         "and/or SCOPE  while reservation already held by"
                         " [%s]: %s, returning RESERVATION_CONFLICT\n",
-                        cmd->se_tfo->get_fabric_name(),
+                        cmd->se_tfo->fabric_name,
                         se_sess->se_node_acl->initiatorname,
-                        pr_res_nacl->se_tpg->se_tpg_tfo->get_fabric_name(),
+                        pr_res_nacl->se_tpg->se_tpg_tfo->fabric_name,
                         pr_res_holder->pr_reg_nacl->initiatorname);
 
                 spin_unlock(&dev->dev_reservation_lock);
@@ -2752,7 +2752,7 @@ core_scsi3_emulate_pro_clear(struct se_cmd *cmd, u64 res_key)
         spin_unlock(&pr_tmpl->registration_lock);
 
         pr_debug("SPC-3 PR [%s] Service Action: CLEAR complete\n",
-                cmd->se_tfo->get_fabric_name());
+                cmd->se_tfo->fabric_name);
 
         core_scsi3_update_and_write_aptpl(cmd->se_dev, false);
 
@@ -2791,11 +2791,11 @@ static void __core_scsi3_complete_pro_preempt(
 
         pr_debug("SPC-3 PR [%s] Service Action: PREEMPT%s created new"
                 " reservation holder TYPE: %s ALL_TG_PT: %d\n",
-                tfo->get_fabric_name(), (preempt_type == PREEMPT_AND_ABORT) ? "_AND_ABORT" : "",
+                tfo->fabric_name, (preempt_type == PREEMPT_AND_ABORT) ? "_AND_ABORT" : "",
                 core_scsi3_pr_dump_type(type),
                 (pr_reg->pr_reg_all_tg_pt) ? 1 : 0);
         pr_debug("SPC-3 PR [%s] PREEMPT%s from Node: %s%s\n",
-                tfo->get_fabric_name(), (preempt_type == PREEMPT_AND_ABORT) ? "_AND_ABORT" : "",
+                tfo->fabric_name, (preempt_type == PREEMPT_AND_ABORT) ? "_AND_ABORT" : "",
                 nacl->initiatorname, i_buf);
         /*
          * For PREEMPT_AND_ABORT, add the preempting reservation's
@@ -3282,7 +3282,7 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key,
                         " proto_ident: 0x%02x does not match ident: 0x%02x"
                         " from fabric: %s\n", proto_ident,
                         dest_se_tpg->proto_id,
-                        dest_tf_ops->get_fabric_name());
+                        dest_tf_ops->fabric_name);
                 ret = TCM_INVALID_PARAMETER_LIST;
                 goto out;
         }
@@ -3299,7 +3299,7 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key,
         buf = NULL;
 
         pr_debug("SPC-3 PR [%s] Extracted initiator %s identifier: %s"
-                " %s\n", dest_tf_ops->get_fabric_name(), (iport_ptr != NULL) ?
+                " %s\n", dest_tf_ops->fabric_name, (iport_ptr != NULL) ?
                 "port" : "device", initiator_str, (iport_ptr != NULL) ?
                 iport_ptr : "");
         /*
@@ -3344,7 +3344,7 @@ after_iport_check:
 
         if (!dest_node_acl) {
                 pr_err("Unable to locate %s dest_node_acl for"
-                        " TransportID%s\n", dest_tf_ops->get_fabric_name(),
+                        " TransportID%s\n", dest_tf_ops->fabric_name,
                         initiator_str);
                 ret = TCM_INVALID_PARAMETER_LIST;
                 goto out;
@@ -3360,7 +3360,7 @@ after_iport_check:
         }
 
         pr_debug("SPC-3 PR REGISTER_AND_MOVE: Found %s dest_node_acl:"
-                " %s from TransportID\n", dest_tf_ops->get_fabric_name(),
+                " %s from TransportID\n", dest_tf_ops->fabric_name,
                 dest_node_acl->initiatorname);
 
         /*
@@ -3370,7 +3370,7 @@ after_iport_check:
         dest_se_deve = core_get_se_deve_from_rtpi(dest_node_acl, rtpi);
         if (!dest_se_deve) {
                 pr_err("Unable to locate %s dest_se_deve from RTPI:"
-                        " %hu\n",  dest_tf_ops->get_fabric_name(), rtpi);
+                        " %hu\n",  dest_tf_ops->fabric_name, rtpi);
                 ret = TCM_INVALID_PARAMETER_LIST;
                 goto out;
         }
@@ -3385,7 +3385,7 @@ after_iport_check:
 
         pr_debug("SPC-3 PR REGISTER_AND_MOVE: Located %s node %s LUN"
                 " ACL for dest_se_deve->mapped_lun: %llu\n",
-                dest_tf_ops->get_fabric_name(), dest_node_acl->initiatorname,
+                dest_tf_ops->fabric_name, dest_node_acl->initiatorname,
                 dest_se_deve->mapped_lun);
 
         /*
@@ -3501,13 +3501,13 @@ after_iport_check:
 
         pr_debug("SPC-3 PR [%s] Service Action: REGISTER_AND_MOVE"
                 " created new reservation holder TYPE: %s on object RTPI:"
-                " %hu  PRGeneration: 0x%08x\n", dest_tf_ops->get_fabric_name(),
+                " %hu  PRGeneration: 0x%08x\n", dest_tf_ops->fabric_name,
                 core_scsi3_pr_dump_type(type), rtpi,
                 dest_pr_reg->pr_res_generation);
         pr_debug("SPC-3 PR Successfully moved reservation from"
                 " %s Fabric Node: %s%s -> %s Fabric Node: %s %s\n",
-                tf_ops->get_fabric_name(), pr_reg_nacl->initiatorname,
-                i_buf, dest_tf_ops->get_fabric_name(),
+                tf_ops->fabric_name, pr_reg_nacl->initiatorname,
+                i_buf, dest_tf_ops->fabric_name,
                 dest_node_acl->initiatorname, (iport_ptr != NULL) ?
                 iport_ptr : "");
         /*
@@ -4095,6 +4095,8 @@ target_check_reservation(struct se_cmd *cmd)
                 return 0;
         if (dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)
                 return 0;
+        if (!dev->dev_attrib.emulate_pr)
+                return 0;
         if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)
                 return 0;
 
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index c062d363dce3..b5388a106567 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -179,20 +179,20 @@ out_free:
 static void
 pscsi_set_inquiry_info(struct scsi_device *sdev, struct t10_wwn *wwn)
 {
-        unsigned char *buf;
-
         if (sdev->inquiry_len < INQUIRY_LEN)
                 return;
-
-        buf = sdev->inquiry;
-        if (!buf)
-                return;
         /*
-         * Use sdev->inquiry from drivers/scsi/scsi_scan.c:scsi_alloc_sdev()
+         * Use sdev->inquiry data from drivers/scsi/scsi_scan.c:scsi_add_lun()
          */
-        memcpy(&wwn->vendor[0], &buf[8], sizeof(wwn->vendor));
-        memcpy(&wwn->model[0], &buf[16], sizeof(wwn->model));
-        memcpy(&wwn->revision[0], &buf[32], sizeof(wwn->revision));
+        BUILD_BUG_ON(sizeof(wwn->vendor) != INQUIRY_VENDOR_LEN + 1);
+        snprintf(wwn->vendor, sizeof(wwn->vendor),
+                 "%." __stringify(INQUIRY_VENDOR_LEN) "s", sdev->vendor);
+        BUILD_BUG_ON(sizeof(wwn->model) != INQUIRY_MODEL_LEN + 1);
+        snprintf(wwn->model, sizeof(wwn->model),
+                 "%." __stringify(INQUIRY_MODEL_LEN) "s", sdev->model);
+        BUILD_BUG_ON(sizeof(wwn->revision) != INQUIRY_REVISION_LEN + 1);
+        snprintf(wwn->revision, sizeof(wwn->revision),
+                 "%." __stringify(INQUIRY_REVISION_LEN) "s", sdev->rev);
 }
 
 static int
@@ -811,7 +811,6 @@ static ssize_t pscsi_show_configfs_dev_params(struct se_device *dev, char *b)
         struct scsi_device *sd = pdv->pdv_sd;
         unsigned char host_id[16];
         ssize_t bl;
-        int i;
 
         if (phv->phv_mode == PHV_VIRTUAL_HOST_ID)
                 snprintf(host_id, 16, "%d", pdv->pdv_host_id);
@@ -824,29 +823,12 @@ static ssize_t pscsi_show_configfs_dev_params(struct se_device *dev, char *b)
                 host_id);
 
         if (sd) {
-                bl += sprintf(b + bl, "        ");
-                bl += sprintf(b + bl, "Vendor: ");
-                for (i = 0; i < 8; i++) {
-                        if (ISPRINT(sd->vendor[i]))   /* printable character? */
-                                bl += sprintf(b + bl, "%c", sd->vendor[i]);
-                        else
-                                bl += sprintf(b + bl, " ");
-                }
-                bl += sprintf(b + bl, " Model: ");
-                for (i = 0; i < 16; i++) {
-                        if (ISPRINT(sd->model[i]))   /* printable character ? */
-                                bl += sprintf(b + bl, "%c", sd->model[i]);
-                        else
-                                bl += sprintf(b + bl, " ");
-                }
-                bl += sprintf(b + bl, " Rev: ");
-                for (i = 0; i < 4; i++) {
-                        if (ISPRINT(sd->rev[i]))   /* printable character ? */
-                                bl += sprintf(b + bl, "%c", sd->rev[i]);
-                        else
-                                bl += sprintf(b + bl, " ");
-                }
-                bl += sprintf(b + bl, "\n");
+                bl += sprintf(b + bl, "        Vendor: %."
+                        __stringify(INQUIRY_VENDOR_LEN) "s", sd->vendor);
+                bl += sprintf(b + bl, " Model: %."
+                        __stringify(INQUIRY_MODEL_LEN) "s", sd->model);
+                bl += sprintf(b + bl, " Rev: %."
+                        __stringify(INQUIRY_REVISION_LEN) "s\n", sd->rev);
         }
         return bl;
 }
diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c
index f459118bc11b..47094ae01c04 100644
--- a/drivers/target/target_core_spc.c
+++ b/drivers/target/target_core_spc.c
@@ -108,12 +108,19 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf)
 
         buf[7] = 0x2; /* CmdQue=1 */
 
-        memcpy(&buf[8], "LIO-ORG ", 8);
-        memset(&buf[16], 0x20, 16);
+        /*
+         * ASCII data fields described as being left-aligned shall have any
+         * unused bytes at the end of the field (i.e., highest offset) and the
+         * unused bytes shall be filled with ASCII space characters (20h).
+         */
+        memset(&buf[8], 0x20,
+               INQUIRY_VENDOR_LEN + INQUIRY_MODEL_LEN + INQUIRY_REVISION_LEN);
+        memcpy(&buf[8], dev->t10_wwn.vendor,
+               strnlen(dev->t10_wwn.vendor, INQUIRY_VENDOR_LEN));
         memcpy(&buf[16], dev->t10_wwn.model,
-               min_t(size_t, strlen(dev->t10_wwn.model), 16));
+               strnlen(dev->t10_wwn.model, INQUIRY_MODEL_LEN));
         memcpy(&buf[32], dev->t10_wwn.revision,
-               min_t(size_t, strlen(dev->t10_wwn.revision), 4));
+               strnlen(dev->t10_wwn.revision, INQUIRY_REVISION_LEN));
         buf[4] = 31; /* Set additional length to 31 */
 
         return 0;
@@ -251,7 +258,10 @@ check_t10_vend_desc:
         buf[off] = 0x2; /* ASCII */
         buf[off+1] = 0x1; /* T10 Vendor ID */
         buf[off+2] = 0x0;
-        memcpy(&buf[off+4], "LIO-ORG", 8);
+        /* left align Vendor ID and pad with spaces */
+        memset(&buf[off+4], 0x20, INQUIRY_VENDOR_LEN);
+        memcpy(&buf[off+4], dev->t10_wwn.vendor,
+               strnlen(dev->t10_wwn.vendor, INQUIRY_VENDOR_LEN));
         /* Extra Byte for NULL Terminator */
         id_len++;
         /* Identifier Length */
@@ -1281,6 +1291,14 @@ spc_parse_cdb(struct se_cmd *cmd, unsigned int *size)
         struct se_device *dev = cmd->se_dev;
         unsigned char *cdb = cmd->t_task_cdb;
 
+        if (!dev->dev_attrib.emulate_pr &&
+            ((cdb[0] == PERSISTENT_RESERVE_IN) ||
+             (cdb[0] == PERSISTENT_RESERVE_OUT) ||
+             (cdb[0] == RELEASE || cdb[0] == RELEASE_10) ||
+             (cdb[0] == RESERVE || cdb[0] == RESERVE_10))) {
+                return TCM_UNSUPPORTED_SCSI_OPCODE;
+        }
+
         switch (cdb[0]) {
         case MODE_SELECT:
                 *size = cdb[4];
diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c
index f0db91ebd735..8d9ceedfd455 100644
--- a/drivers/target/target_core_stat.c
+++ b/drivers/target/target_core_stat.c
@@ -246,43 +246,25 @@ static ssize_t target_stat_lu_lu_name_show(struct config_item *item, char *page)
 static ssize_t target_stat_lu_vend_show(struct config_item *item, char *page)
 {
         struct se_device *dev = to_stat_lu_dev(item);
-        int i;
-        char str[sizeof(dev->t10_wwn.vendor)+1];
 
-        /* scsiLuVendorId */
-        for (i = 0; i < sizeof(dev->t10_wwn.vendor); i++)
-                str[i] = ISPRINT(dev->t10_wwn.vendor[i]) ?
-                        dev->t10_wwn.vendor[i] : ' ';
-        str[i] = '\0';
-        return snprintf(page, PAGE_SIZE, "%s\n", str);
+        return snprintf(page, PAGE_SIZE, "%-" __stringify(INQUIRY_VENDOR_LEN)
+                        "s\n", dev->t10_wwn.vendor);
 }
 
 static ssize_t target_stat_lu_prod_show(struct config_item *item, char *page)
 {
         struct se_device *dev = to_stat_lu_dev(item);
-        int i;
-        char str[sizeof(dev->t10_wwn.model)+1];
 
-        /* scsiLuProductId */
-        for (i = 0; i < sizeof(dev->t10_wwn.model); i++)
-                str[i] = ISPRINT(dev->t10_wwn.model[i]) ?
-                        dev->t10_wwn.model[i] : ' ';
-        str[i] = '\0';
-        return snprintf(page, PAGE_SIZE, "%s\n", str);
+        return snprintf(page, PAGE_SIZE, "%-" __stringify(INQUIRY_MODEL_LEN)
+                        "s\n", dev->t10_wwn.model);
 }
 
 static ssize_t target_stat_lu_rev_show(struct config_item *item, char *page)
 {
         struct se_device *dev = to_stat_lu_dev(item);
-        int i;
-        char str[sizeof(dev->t10_wwn.revision)+1];
 
-        /* scsiLuRevisionId */
-        for (i = 0; i < sizeof(dev->t10_wwn.revision); i++)
-                str[i] = ISPRINT(dev->t10_wwn.revision[i]) ?
-                        dev->t10_wwn.revision[i] : ' ';
-        str[i] = '\0';
-        return snprintf(page, PAGE_SIZE, "%s\n", str);
+        return snprintf(page, PAGE_SIZE, "%-" __stringify(INQUIRY_REVISION_LEN)
+                        "s\n", dev->t10_wwn.revision);
 }
 
 static ssize_t target_stat_lu_dev_type_show(struct config_item *item, char *page)
@@ -612,7 +594,7 @@ static ssize_t target_stat_tgt_port_name_show(struct config_item *item,
         dev = rcu_dereference(lun->lun_se_dev);
         if (dev)
                 ret = snprintf(page, PAGE_SIZE, "%sPort#%u\n",
-                        tpg->se_tpg_tfo->get_fabric_name(),
+                        tpg->se_tpg_tfo->fabric_name,
                         lun->lun_rtpi);
         rcu_read_unlock();
         return ret;
@@ -767,7 +749,7 @@ static ssize_t target_stat_transport_device_show(struct config_item *item,
         if (dev) {
                 /* scsiTransportType */
                 ret = snprintf(page, PAGE_SIZE, "scsiTransport%s\n",
-                               tpg->se_tpg_tfo->get_fabric_name());
+                               tpg->se_tpg_tfo->fabric_name);
         }
         rcu_read_unlock();
         return ret;
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index 6d1179a7f043..ad0061e09d4c 100644
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -163,18 +163,23 @@ void core_tmr_abort_task(
                         continue;
 
                 printk("ABORT_TASK: Found referenced %s task_tag: %llu\n",
-                        se_cmd->se_tfo->get_fabric_name(), ref_tag);
+                        se_cmd->se_tfo->fabric_name, ref_tag);
 
-                if (!__target_check_io_state(se_cmd, se_sess, 0))
+                if (!__target_check_io_state(se_cmd, se_sess,
+                                             dev->dev_attrib.emulate_tas))
                         continue;
 
                 spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
 
-                cancel_work_sync(&se_cmd->work);
-                transport_wait_for_tasks(se_cmd);
+                /*
+                 * Ensure that this ABORT request is visible to the LU RESET
+                 * code.
+                 */
+                if (!tmr->tmr_dev)
+                        WARN_ON_ONCE(transport_lookup_tmr_lun(tmr->task_cmd,
+                                                se_cmd->orig_fe_lun) < 0);
 
-                if (!transport_cmd_finish_abort(se_cmd))
-                        target_put_sess_cmd(se_cmd);
+                target_put_cmd_and_wait(se_cmd);
 
                 printk("ABORT_TASK: Sending TMR_FUNCTION_COMPLETE for"
                                 " ref_tag: %llu\n", ref_tag);
@@ -268,14 +273,28 @@ static void core_tmr_drain_tmr_list(
                         (preempt_and_abort_list) ? "Preempt" : "", tmr_p,
                         tmr_p->function, tmr_p->response, cmd->t_state);
 
-                cancel_work_sync(&cmd->work);
-                transport_wait_for_tasks(cmd);
-
-                if (!transport_cmd_finish_abort(cmd))
-                        target_put_sess_cmd(cmd);
+                target_put_cmd_and_wait(cmd);
         }
 }
 
+/**
+ * core_tmr_drain_state_list() - abort SCSI commands associated with a device
+ *
+ * @dev:       Device for which to abort outstanding SCSI commands.
+ * @prout_cmd: Pointer to the SCSI PREEMPT AND ABORT if this function is called
+ *             to realize the PREEMPT AND ABORT functionality.
+ * @tmr_sess:  Session through which the LUN RESET has been received.
+ * @tas:       Task Aborted Status (TAS) bit from the SCSI control mode page.
+ *             A quote from SPC-4, paragraph "7.5.10 Control mode page":
+ *             "A task aborted status (TAS) bit set to zero specifies that
+ *             aborted commands shall be terminated by the device server
+ *             without any response to the application client. A TAS bit set
+ *             to one specifies that commands aborted by the actions of an I_T
+ *             nexus other than the I_T nexus on which the command was
+ *             received shall be completed with TASK ABORTED status."
+ * @preempt_and_abort_list: For the PREEMPT AND ABORT functionality, a list
+ *             with registrations that will be preempted.
+ */
 static void core_tmr_drain_state_list(
         struct se_device *dev,
         struct se_cmd *prout_cmd,
@@ -350,18 +369,7 @@ static void core_tmr_drain_state_list(
                          cmd->tag, (preempt_and_abort_list) ? "preempt" : "",
                          cmd->pr_res_key);
 
-                /*
-                 * If the command may be queued onto a workqueue cancel it now.
-                 *
-                 * This is equivalent to removal from the execute queue in the
-                 * loop above, but we do it down here given that
-                 * cancel_work_sync may block.
-                 */
-                cancel_work_sync(&cmd->work);
-                transport_wait_for_tasks(cmd);
-
-                if (!transport_cmd_finish_abort(cmd))
-                        target_put_sess_cmd(cmd);
+                target_put_cmd_and_wait(cmd);
         }
 }
 
@@ -398,7 +406,7 @@ int core_tmr_lun_reset(
                 if (tmr_nacl && tmr_tpg) {
                         pr_debug("LUN_RESET: TMR caller fabric: %s"
                                 " initiator port %s\n",
-                                tmr_tpg->se_tpg_tfo->get_fabric_name(),
+                                tmr_tpg->se_tpg_tfo->fabric_name,
                                 tmr_nacl->initiatorname);
                 }
         }
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index 02e8a5d86658..e2ace1059437 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -151,7 +151,7 @@ void core_tpg_add_node_to_devs(
 
                 pr_debug("TARGET_CORE[%s]->TPG[%u]_LUN[%llu] - Adding %s"
                         " access for LUN in Demo Mode\n",
-                        tpg->se_tpg_tfo->get_fabric_name(),
+                        tpg->se_tpg_tfo->fabric_name,
                         tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
                         lun_access_ro ? "READ-ONLY" : "READ-WRITE");
 
@@ -176,7 +176,7 @@ target_set_nacl_queue_depth(struct se_portal_group *tpg,
 
         if (!acl->queue_depth) {
                 pr_warn("Queue depth for %s Initiator Node: %s is 0,"
-                        "defaulting to 1.\n", tpg->se_tpg_tfo->get_fabric_name(),
+                        "defaulting to 1.\n", tpg->se_tpg_tfo->fabric_name,
                         acl->initiatorname);
                 acl->queue_depth = 1;
         }
@@ -227,11 +227,11 @@ static void target_add_node_acl(struct se_node_acl *acl)
 
         pr_debug("%s_TPG[%hu] - Added %s ACL with TCQ Depth: %d for %s"
                 " Initiator Node: %s\n",
-                tpg->se_tpg_tfo->get_fabric_name(),
+                tpg->se_tpg_tfo->fabric_name,
                 tpg->se_tpg_tfo->tpg_get_tag(tpg),
                 acl->dynamic_node_acl ? "DYNAMIC" : "",
                 acl->queue_depth,
-                tpg->se_tpg_tfo->get_fabric_name(),
+                tpg->se_tpg_tfo->fabric_name,
                 acl->initiatorname);
 }
 
@@ -313,7 +313,7 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
                 if (acl->dynamic_node_acl) {
                         acl->dynamic_node_acl = 0;
                         pr_debug("%s_TPG[%u] - Replacing dynamic ACL"
-                                " for %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                                " for %s\n", tpg->se_tpg_tfo->fabric_name,
                                 tpg->se_tpg_tfo->tpg_get_tag(tpg), initiatorname);
                         mutex_unlock(&tpg->acl_node_mutex);
                         return acl;
@@ -321,7 +321,7 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
 
                 pr_err("ACL entry for %s Initiator"
                         " Node %s already exists for TPG %u, ignoring"
-                        " request.\n",  tpg->se_tpg_tfo->get_fabric_name(),
+                        " request.\n",  tpg->se_tpg_tfo->fabric_name,
                         initiatorname, tpg->se_tpg_tfo->tpg_get_tag(tpg));
                 mutex_unlock(&tpg->acl_node_mutex);
                 return ERR_PTR(-EEXIST);
@@ -380,9 +380,9 @@ void core_tpg_del_initiator_node_acl(struct se_node_acl *acl)
         core_free_device_list_for_node(acl, tpg);
 
         pr_debug("%s_TPG[%hu] - Deleted ACL with TCQ Depth: %d for %s"
-                " Initiator Node: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                " Initiator Node: %s\n", tpg->se_tpg_tfo->fabric_name,
                 tpg->se_tpg_tfo->tpg_get_tag(tpg), acl->queue_depth,
-                tpg->se_tpg_tfo->get_fabric_name(), acl->initiatorname);
+                tpg->se_tpg_tfo->fabric_name, acl->initiatorname);
 
         kfree(acl);
 }
@@ -418,7 +418,7 @@ int core_tpg_set_initiator_node_queue_depth(
 
         pr_debug("Successfully changed queue depth to: %d for Initiator"
                 " Node: %s on %s Target Portal Group: %u\n", acl->queue_depth,
-                acl->initiatorname, tpg->se_tpg_tfo->get_fabric_name(),
+                acl->initiatorname, tpg->se_tpg_tfo->fabric_name,
                 tpg->se_tpg_tfo->tpg_get_tag(tpg));
 
         return 0;
@@ -512,7 +512,7 @@ int core_tpg_register(
         spin_unlock_bh(&tpg_lock);
 
         pr_debug("TARGET_CORE[%s]: Allocated portal_group for endpoint: %s, "
-                 "Proto: %d, Portal Tag: %u\n", se_tpg->se_tpg_tfo->get_fabric_name(),
+                 "Proto: %d, Portal Tag: %u\n", se_tpg->se_tpg_tfo->fabric_name,
                 se_tpg->se_tpg_tfo->tpg_get_wwn(se_tpg) ?
                 se_tpg->se_tpg_tfo->tpg_get_wwn(se_tpg) : NULL,
                 se_tpg->proto_id, se_tpg->se_tpg_tfo->tpg_get_tag(se_tpg));
@@ -528,7 +528,7 @@ int core_tpg_deregister(struct se_portal_group *se_tpg)
         LIST_HEAD(node_list);
 
         pr_debug("TARGET_CORE[%s]: Deallocating portal_group for endpoint: %s, "
-                 "Proto: %d, Portal Tag: %u\n", tfo->get_fabric_name(),
+                 "Proto: %d, Portal Tag: %u\n", tfo->fabric_name,
                 tfo->tpg_get_wwn(se_tpg) ? tfo->tpg_get_wwn(se_tpg) : NULL,
                 se_tpg->proto_id, tfo->tpg_get_tag(se_tpg));
 
@@ -577,7 +577,6 @@ struct se_lun *core_tpg_alloc_lun(
         }
         lun->unpacked_lun = unpacked_lun;
         atomic_set(&lun->lun_acl_count, 0);
-        init_completion(&lun->lun_ref_comp);
         init_completion(&lun->lun_shutdown_comp);
         INIT_LIST_HEAD(&lun->lun_deve_list);
         INIT_LIST_HEAD(&lun->lun_dev_link);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 2cfd61d62e97..ef9e75b359d4 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -224,19 +224,28 @@ void transport_subsystem_check_init(void)
         sub_api_initialized = 1;
 }
 
+static void target_release_sess_cmd_refcnt(struct percpu_ref *ref)
+{
+        struct se_session *sess = container_of(ref, typeof(*sess), cmd_count);
+
+        wake_up(&sess->cmd_list_wq);
+}
+
 /**
  * transport_init_session - initialize a session object
  * @se_sess: Session object pointer.
  *
  * The caller must have zero-initialized @se_sess before calling this function.
  */
-void transport_init_session(struct se_session *se_sess)
+int transport_init_session(struct se_session *se_sess)
 {
         INIT_LIST_HEAD(&se_sess->sess_list);
         INIT_LIST_HEAD(&se_sess->sess_acl_list);
         INIT_LIST_HEAD(&se_sess->sess_cmd_list);
         spin_lock_init(&se_sess->sess_cmd_lock);
         init_waitqueue_head(&se_sess->cmd_list_wq);
+        return percpu_ref_init(&se_sess->cmd_count,
+                               target_release_sess_cmd_refcnt, 0, GFP_KERNEL);
 }
 EXPORT_SYMBOL(transport_init_session);
 
@@ -247,6 +256,7 @@ EXPORT_SYMBOL(transport_init_session);
 struct se_session *transport_alloc_session(enum target_prot_op sup_prot_ops)
 {
         struct se_session *se_sess;
+        int ret;
 
         se_sess = kmem_cache_zalloc(se_sess_cache, GFP_KERNEL);
         if (!se_sess) {
@@ -254,7 +264,11 @@ struct se_session *transport_alloc_session(enum target_prot_op sup_prot_ops)
                                 " se_sess_cache\n");
                 return ERR_PTR(-ENOMEM);
         }
-        transport_init_session(se_sess);
+        ret = transport_init_session(se_sess);
+        if (ret < 0) {
+                kmem_cache_free(se_sess_cache, se_sess);
+                return ERR_PTR(ret);
+        }
         se_sess->sup_prot_ops = sup_prot_ops;
 
         return se_sess;
@@ -273,14 +287,11 @@ int transport_alloc_session_tags(struct se_session *se_sess,
 {
         int rc;
 
-        se_sess->sess_cmd_map = kcalloc(tag_size, tag_num,
-                                        GFP_KERNEL | __GFP_NOWARN | __GFP_RETRY_MAYFAIL);
+        se_sess->sess_cmd_map = kvcalloc(tag_size, tag_num,
+                                         GFP_KERNEL | __GFP_RETRY_MAYFAIL);
         if (!se_sess->sess_cmd_map) {
-                se_sess->sess_cmd_map = vzalloc(array_size(tag_size, tag_num));
-                if (!se_sess->sess_cmd_map) {
-                        pr_err("Unable to allocate se_sess->sess_cmd_map\n");
-                        return -ENOMEM;
-                }
+                pr_err("Unable to allocate se_sess->sess_cmd_map\n");
+                return -ENOMEM;
         }
 
         rc = sbitmap_queue_init_node(&se_sess->sess_tag_pool, tag_num, -1,
@@ -397,7 +408,7 @@ void __transport_register_session(
         list_add_tail(&se_sess->sess_list, &se_tpg->tpg_sess_list);
 
         pr_debug("TARGET_CORE[%s]: Registered fabric_sess_ptr: %p\n",
-                se_tpg->se_tpg_tfo->get_fabric_name(), se_sess->fabric_sess_ptr);
+                se_tpg->se_tpg_tfo->fabric_name, se_sess->fabric_sess_ptr);
 }
 EXPORT_SYMBOL(__transport_register_session);
 
@@ -581,6 +592,7 @@ void transport_free_session(struct se_session *se_sess)
                 sbitmap_queue_free(&se_sess->sess_tag_pool);
                 kvfree(se_sess->sess_cmd_map);
         }
+        percpu_ref_exit(&se_sess->cmd_count);
         kmem_cache_free(se_sess_cache, se_sess);
 }
 EXPORT_SYMBOL(transport_free_session);
@@ -602,7 +614,7 @@ void transport_deregister_session(struct se_session *se_sess)
         spin_unlock_irqrestore(&se_tpg->session_lock, flags);
 
         pr_debug("TARGET_CORE[%s]: Deregistered fabric_sess\n",
-                se_tpg->se_tpg_tfo->get_fabric_name());
+                se_tpg->se_tpg_tfo->fabric_name);
         /*
          * If last kref is dropping now for an explicit NodeACL, awake sleeping
          * ->acl_free_comp caller to wakeup configfs se_node_acl->acl_group
@@ -695,32 +707,6 @@ static void transport_lun_remove_cmd(struct se_cmd *cmd)
                 percpu_ref_put(&lun->lun_ref);
 }
 
-int transport_cmd_finish_abort(struct se_cmd *cmd)
-{
-        bool send_tas = cmd->transport_state & CMD_T_TAS;
-        bool ack_kref = (cmd->se_cmd_flags & SCF_ACK_KREF);
-        int ret = 0;
-
-        if (send_tas)
-                transport_send_task_abort(cmd);
-
-        if (cmd->se_cmd_flags & SCF_SE_LUN_CMD)
-                transport_lun_remove_cmd(cmd);
-        /*
-         * Allow the fabric driver to unmap any resources before
-         * releasing the descriptor via TFO->release_cmd()
-         */
-        if (!send_tas)
-                cmd->se_tfo->aborted_task(cmd);
-
-        if (transport_cmd_check_stop_to_fabric(cmd))
-                return 1;
-        if (!send_tas && ack_kref)
-                ret = target_put_sess_cmd(cmd);
-
-        return ret;
-}
-
 static void target_complete_failure_work(struct work_struct *work)
 {
         struct se_cmd *cmd = container_of(work, struct se_cmd, work);
@@ -770,12 +756,88 @@ void transport_copy_sense_to_cmd(struct se_cmd *cmd, unsigned char *sense)
 }
 EXPORT_SYMBOL(transport_copy_sense_to_cmd);
 
+static void target_handle_abort(struct se_cmd *cmd)
+{
+        bool tas = cmd->transport_state & CMD_T_TAS;
+        bool ack_kref = cmd->se_cmd_flags & SCF_ACK_KREF;
+        int ret;
+
+        pr_debug("tag %#llx: send_abort_response = %d\n", cmd->tag, tas);
+
+        if (tas) {
+                if (!(cmd->se_cmd_flags & SCF_SCSI_TMR_CDB)) {
+                        cmd->scsi_status = SAM_STAT_TASK_ABORTED;
+                        pr_debug("Setting SAM_STAT_TASK_ABORTED status for CDB: 0x%02x, ITT: 0x%08llx\n",
+                                 cmd->t_task_cdb[0], cmd->tag);
+                        trace_target_cmd_complete(cmd);
+                        ret = cmd->se_tfo->queue_status(cmd);
+                        if (ret) {
+                                transport_handle_queue_full(cmd, cmd->se_dev,
+                                                            ret, false);
+                                return;
+                        }
+                } else {
+                        cmd->se_tmr_req->response = TMR_FUNCTION_REJECTED;
+                        cmd->se_tfo->queue_tm_rsp(cmd);
+                }
+        } else {
+                /*
+                 * Allow the fabric driver to unmap any resources before
+                 * releasing the descriptor via TFO->release_cmd().
+                 */
+                cmd->se_tfo->aborted_task(cmd);
+                if (ack_kref)
+                        WARN_ON_ONCE(target_put_sess_cmd(cmd) != 0);
+                /*
+                 * To do: establish a unit attention condition on the I_T
+                 * nexus associated with cmd. See also the paragraph "Aborting
+                 * commands" in SAM.
+                 */
+        }
+
+        WARN_ON_ONCE(kref_read(&cmd->cmd_kref) == 0);
+
+        transport_lun_remove_cmd(cmd);
+
+        transport_cmd_check_stop_to_fabric(cmd);
+}
+
+static void target_abort_work(struct work_struct *work)
+{
+        struct se_cmd *cmd = container_of(work, struct se_cmd, work);
+
+        target_handle_abort(cmd);
+}
+
+static bool target_cmd_interrupted(struct se_cmd *cmd)
+{
+        int post_ret;
+
+        if (cmd->transport_state & CMD_T_ABORTED) {
+                if (cmd->transport_complete_callback)
+                        cmd->transport_complete_callback(cmd, false, &post_ret);
+                INIT_WORK(&cmd->work, target_abort_work);
+                queue_work(target_completion_wq, &cmd->work);
+                return true;
+        } else if (cmd->transport_state & CMD_T_STOP) {
+                if (cmd->transport_complete_callback)
+                        cmd->transport_complete_callback(cmd, false, &post_ret);
+                complete_all(&cmd->t_transport_stop_comp);
+                return true;
+        }
+
+        return false;
+}
+
+/* May be called from interrupt context so must not sleep. */
 void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status)
 {
-        struct se_device *dev = cmd->se_dev;
         int success;
         unsigned long flags;
 
+        if (target_cmd_interrupted(cmd))
+                return;
+
         cmd->scsi_status = scsi_status;
 
         spin_lock_irqsave(&cmd->t_state_lock, flags);
@@ -791,34 +853,12 @@ void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status)
                 break;
         }
 
-        /*
-         * Check for case where an explicit ABORT_TASK has been received
-         * and transport_wait_for_tasks() will be waiting for completion..
-         */
-        if (cmd->transport_state & CMD_T_ABORTED ||
-            cmd->transport_state & CMD_T_STOP) {
-                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                /*
-                 * If COMPARE_AND_WRITE was stopped by __transport_wait_for_tasks(),
-                 * release se_device->caw_sem obtained by sbc_compare_and_write()
-                 * since target_complete_ok_work() or target_complete_failure_work()
-                 * won't be called to invoke the normal CAW completion callbacks.
-                 */
-                if (cmd->se_cmd_flags & SCF_COMPARE_AND_WRITE) {
-                        up(&dev->caw_sem);
-                }
-                complete_all(&cmd->t_transport_stop_comp);
-                return;
-        } else if (!success) {
-                INIT_WORK(&cmd->work, target_complete_failure_work);
-        } else {
-                INIT_WORK(&cmd->work, target_complete_ok_work);
-        }
-
         cmd->t_state = TRANSPORT_COMPLETE;
         cmd->transport_state |= (CMD_T_COMPLETE | CMD_T_ACTIVE);
         spin_unlock_irqrestore(&cmd->t_state_lock, flags);
 
+        INIT_WORK(&cmd->work, success ? target_complete_ok_work :
+                  target_complete_failure_work);
         if (cmd->se_cmd_flags & SCF_USE_CPUID)
                 queue_work_on(cmd->cpuid, target_completion_wq, &cmd->work);
         else
@@ -880,7 +920,7 @@ void target_qf_do_work(struct work_struct *work)
                 atomic_dec_mb(&dev->dev_qf_count);
 
                 pr_debug("Processing %s cmd: %p QUEUE_FULL in work queue"
-                        " context: %s\n", cmd->se_tfo->get_fabric_name(), cmd,
+                        " context: %s\n", cmd->se_tfo->fabric_name, cmd,
                         (cmd->t_state == TRANSPORT_COMPLETE_QF_OK) ? "COMPLETE_OK" :
                         (cmd->t_state == TRANSPORT_COMPLETE_QF_WP) ? "WRITE_PENDING"
                         : "UNKNOWN");
@@ -1244,7 +1284,7 @@ target_cmd_size_check(struct se_cmd *cmd, unsigned int size)
         } else if (size != cmd->data_length) {
                 pr_warn_ratelimited("TARGET_CORE[%s]: Expected Transfer Length:"
                         " %u does not match SCSI CDB Length: %u for SAM Opcode:"
-                        " 0x%02x\n", cmd->se_tfo->get_fabric_name(),
+                        " 0x%02x\n", cmd->se_tfo->fabric_name,
                                 cmd->data_length, size, cmd->t_task_cdb[0]);
 
                 if (cmd->data_direction == DMA_TO_DEVICE) {
@@ -1316,7 +1356,8 @@ void transport_init_se_cmd(
         INIT_LIST_HEAD(&cmd->se_cmd_list);
         INIT_LIST_HEAD(&cmd->state_list);
         init_completion(&cmd->t_transport_stop_comp);
-        cmd->compl = NULL;
+        cmd->free_compl = NULL;
+        cmd->abrt_compl = NULL;
         spin_lock_init(&cmd->t_state_lock);
         INIT_WORK(&cmd->work, NULL);
         kref_init(&cmd->cmd_kref);
@@ -1396,7 +1437,7 @@ target_setup_cmd_from_cdb(struct se_cmd *cmd, unsigned char *cdb)
         ret = dev->transport->parse_cdb(cmd);
         if (ret == TCM_UNSUPPORTED_SCSI_OPCODE)
                 pr_warn_ratelimited("%s/%s: Unsupported SCSI Opcode 0x%02x, sending CHECK_CONDITION.\n",
-                                    cmd->se_tfo->get_fabric_name(),
+                                    cmd->se_tfo->fabric_name,
                                     cmd->se_sess->se_node_acl->initiatorname,
                                     cmd->t_task_cdb[0]);
         if (ret)
@@ -1792,8 +1833,11 @@ void transport_generic_request_failure(struct se_cmd *cmd,
         if (cmd->transport_complete_callback)
                 cmd->transport_complete_callback(cmd, false, &post_ret);
 
-        if (transport_check_aborted_status(cmd, 1))
+        if (cmd->transport_state & CMD_T_ABORTED) {
+                INIT_WORK(&cmd->work, target_abort_work);
+                queue_work(target_completion_wq, &cmd->work);
                 return;
+        }
 
         switch (sense_reason) {
         case TCM_NON_EXISTENT_LUN:
@@ -1999,8 +2043,6 @@ static bool target_handle_task_attr(struct se_cmd *cmd)
         return true;
 }
 
-static int __transport_check_aborted_status(struct se_cmd *, int);
-
 void target_execute_cmd(struct se_cmd *cmd)
 {
         /*
@@ -2009,20 +2051,10 @@ void target_execute_cmd(struct se_cmd *cmd)
          *
          * If the received CDB has already been aborted stop processing it here.
          */
-        spin_lock_irq(&cmd->t_state_lock);
-        if (__transport_check_aborted_status(cmd, 1)) {
-                spin_unlock_irq(&cmd->t_state_lock);
-                return;
-        }
-        if (cmd->transport_state & CMD_T_STOP) {
-                pr_debug("%s:%d CMD_T_STOP for ITT: 0x%08llx\n",
-                        __func__, __LINE__, cmd->tag);
-
-                spin_unlock_irq(&cmd->t_state_lock);
-                complete_all(&cmd->t_transport_stop_comp);
+        if (target_cmd_interrupted(cmd))
                 return;
-        }
 
+        spin_lock_irq(&cmd->t_state_lock);
         cmd->t_state = TRANSPORT_PROCESSING;
         cmd->transport_state &= ~CMD_T_PRE_EXECUTE;
         cmd->transport_state |= CMD_T_ACTIVE | CMD_T_SENT;
@@ -2571,7 +2603,8 @@ transport_generic_new_cmd(struct se_cmd *cmd)
          * Determine if frontend context caller is requesting the stopping of
          * this command for frontend exceptions.
          */
-        if (cmd->transport_state & CMD_T_STOP) {
+        if (cmd->transport_state & CMD_T_STOP &&
+            !cmd->se_tfo->write_pending_must_be_called) {
                 pr_debug("%s:%d CMD_T_STOP for ITT: 0x%08llx\n",
                          __func__, __LINE__, cmd->tag);
 
@@ -2635,13 +2668,29 @@ static void target_wait_free_cmd(struct se_cmd *cmd, bool *aborted, bool *tas)
 }
 
 /*
+ * Call target_put_sess_cmd() and wait until target_release_cmd_kref(@cmd) has
+ * finished.
+ */
+void target_put_cmd_and_wait(struct se_cmd *cmd)
+{
+        DECLARE_COMPLETION_ONSTACK(compl);
+
+        WARN_ON_ONCE(cmd->abrt_compl);
+        cmd->abrt_compl = &compl;
+        target_put_sess_cmd(cmd);
+        wait_for_completion(&compl);
+}
+
+/*
  * This function is called by frontend drivers after processing of a command
  * has finished.
  *
- * The protocol for ensuring that either the regular flow or the TMF
- * code drops one reference is as follows:
+ * The protocol for ensuring that either the regular frontend command
+ * processing flow or target_handle_abort() code drops one reference is as
+ * follows:
  * - Calling .queue_data_in(), .queue_status() or queue_tm_rsp() will cause
- *   the frontend driver to drop one reference, synchronously or asynchronously.
+ *   the frontend driver to call this function synchronously or asynchronously.
+ *   That will cause one reference to be dropped.
  * - During regular command processing the target core sets CMD_T_COMPLETE
  *   before invoking one of the .queue_*() functions.
  * - The code that aborts commands skips commands and TMFs for which
@@ -2653,7 +2702,7 @@ static void target_wait_free_cmd(struct se_cmd *cmd, bool *aborted, bool *tas)
  * - For aborted commands for which CMD_T_TAS has been set .queue_status() will
  *   be called and will drop a reference.
  * - For aborted commands for which CMD_T_TAS has not been set .aborted_task()
- *   will be called. transport_cmd_finish_abort() will drop the final reference.
+ *   will be called. target_handle_abort() will drop the final reference.
  */
 int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
 {
@@ -2677,9 +2726,8 @@ int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
                         transport_lun_remove_cmd(cmd);
         }
         if (aborted)
-                cmd->compl = &compl;
-        if (!aborted || tas)
-                ret = target_put_sess_cmd(cmd);
+                cmd->free_compl = &compl;
+        ret = target_put_sess_cmd(cmd);
         if (aborted) {
                 pr_debug("Detected CMD_T_ABORTED for ITT: %llu\n", cmd->tag);
                 wait_for_completion(&compl);
@@ -2719,6 +2767,7 @@ int target_get_sess_cmd(struct se_cmd *se_cmd, bool ack_kref)
         }
         se_cmd->transport_state |= CMD_T_PRE_EXECUTE;
         list_add_tail(&se_cmd->se_cmd_list, &se_sess->sess_cmd_list);
+        percpu_ref_get(&se_sess->cmd_count);
 out:
         spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
 
@@ -2743,21 +2792,24 @@ static void target_release_cmd_kref(struct kref *kref)
 {
         struct se_cmd *se_cmd = container_of(kref, struct se_cmd, cmd_kref);
         struct se_session *se_sess = se_cmd->se_sess;
-        struct completion *compl = se_cmd->compl;
+        struct completion *free_compl = se_cmd->free_compl;
+        struct completion *abrt_compl = se_cmd->abrt_compl;
         unsigned long flags;
 
         if (se_sess) {
                 spin_lock_irqsave(&se_sess->sess_cmd_lock, flags);
                 list_del_init(&se_cmd->se_cmd_list);
-                if (se_sess->sess_tearing_down && list_empty(&se_sess->sess_cmd_list))
-                        wake_up(&se_sess->cmd_list_wq);
                 spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
         }
 
         target_free_cmd_mem(se_cmd);
         se_cmd->se_tfo->release_cmd(se_cmd);
-        if (compl)
-                complete(compl);
+        if (free_compl)
+                complete(free_compl);
+        if (abrt_compl)
+                complete(abrt_compl);
+
+        percpu_ref_put(&se_sess->cmd_count);
 }
 
 /**
@@ -2886,6 +2938,8 @@ void target_sess_cmd_list_set_waiting(struct se_session *se_sess)
         spin_lock_irqsave(&se_sess->sess_cmd_lock, flags);
         se_sess->sess_tearing_down = 1;
         spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
+
+        percpu_ref_kill(&se_sess->cmd_count);
 }
 EXPORT_SYMBOL(target_sess_cmd_list_set_waiting);
 
@@ -2900,52 +2954,24 @@ void target_wait_for_sess_cmds(struct se_session *se_sess)
 
         WARN_ON_ONCE(!se_sess->sess_tearing_down);
 
-        spin_lock_irq(&se_sess->sess_cmd_lock);
         do {
-                ret = wait_event_lock_irq_timeout(
-                                se_sess->cmd_list_wq,
-                                list_empty(&se_sess->sess_cmd_list),
-                                se_sess->sess_cmd_lock, 180 * HZ);
+                ret = wait_event_timeout(se_sess->cmd_list_wq,
+                                percpu_ref_is_zero(&se_sess->cmd_count),
+                                180 * HZ);
                 list_for_each_entry(cmd, &se_sess->sess_cmd_list, se_cmd_list)
                         target_show_cmd("session shutdown: still waiting for ",
                                         cmd);
         } while (ret <= 0);
-        spin_unlock_irq(&se_sess->sess_cmd_lock);
 }
 EXPORT_SYMBOL(target_wait_for_sess_cmds);
 
-static void target_lun_confirm(struct percpu_ref *ref)
-{
-        struct se_lun *lun = container_of(ref, struct se_lun, lun_ref);
-
-        complete(&lun->lun_ref_comp);
-}
-
+/*
+ * Prevent that new percpu_ref_tryget_live() calls succeed and wait until
+ * all references to the LUN have been released. Called during LUN shutdown.
+ */
 void transport_clear_lun_ref(struct se_lun *lun)
 {
-        /*
-         * Mark the percpu-ref as DEAD, switch to atomic_t mode, drop
-         * the initial reference and schedule confirm kill to be
-         * executed after one full RCU grace period has completed.
-         */
-        percpu_ref_kill_and_confirm(&lun->lun_ref, target_lun_confirm);
-        /*
-         * The first completion waits for percpu_ref_switch_to_atomic_rcu()
-         * to call target_lun_confirm after lun->lun_ref has been marked
-         * as __PERCPU_REF_DEAD on all CPUs, and switches to atomic_t
-         * mode so that percpu_ref_tryget_live() lookup of lun->lun_ref
-         * fails for all new incoming I/O.
-         */
-        wait_for_completion(&lun->lun_ref_comp);
-        /*
-         * The second completion waits for percpu_ref_put_many() to
-         * invoke ->release() after lun->lun_ref has switched to
-         * atomic_t mode, and lun->lun_ref.count has reached zero.
-         *
-         * At this point all target-core lun->lun_ref references have
-         * been dropped via transport_lun_remove_cmd(), and it's safe
-         * to proceed with the remaining LUN shutdown.
-         */
+        percpu_ref_kill(&lun->lun_ref);
         wait_for_completion(&lun->lun_shutdown_comp);
 }
 
@@ -3229,6 +3255,8 @@ transport_send_check_condition_and_sense(struct se_cmd *cmd,
 {
         unsigned long flags;
 
+        WARN_ON_ONCE(cmd->se_cmd_flags & SCF_SCSI_TMR_CDB);
+
         spin_lock_irqsave(&cmd->t_state_lock, flags);
         if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) {
                 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
@@ -3245,114 +3273,15 @@ transport_send_check_condition_and_sense(struct se_cmd *cmd,
 }
 EXPORT_SYMBOL(transport_send_check_condition_and_sense);
 
-static int __transport_check_aborted_status(struct se_cmd *cmd, int send_status)
-        __releases(&cmd->t_state_lock)
-        __acquires(&cmd->t_state_lock)
-{
-        int ret;
-
-        assert_spin_locked(&cmd->t_state_lock);
-        WARN_ON_ONCE(!irqs_disabled());
-
-        if (!(cmd->transport_state & CMD_T_ABORTED))
-                return 0;
-        /*
-         * If cmd has been aborted but either no status is to be sent or it has
-         * already been sent, just return
-         */
-        if (!send_status || !(cmd->se_cmd_flags & SCF_SEND_DELAYED_TAS)) {
-                if (send_status)
-                        cmd->se_cmd_flags |= SCF_SEND_DELAYED_TAS;
-                return 1;
-        }
-
-        pr_debug("Sending delayed SAM_STAT_TASK_ABORTED status for CDB:"
-                " 0x%02x ITT: 0x%08llx\n", cmd->t_task_cdb[0], cmd->tag);
-
-        cmd->se_cmd_flags &= ~SCF_SEND_DELAYED_TAS;
-        cmd->scsi_status = SAM_STAT_TASK_ABORTED;
-        trace_target_cmd_complete(cmd);
-
-        spin_unlock_irq(&cmd->t_state_lock);
-        ret = cmd->se_tfo->queue_status(cmd);
-        if (ret)
-                transport_handle_queue_full(cmd, cmd->se_dev, ret, false);
-        spin_lock_irq(&cmd->t_state_lock);
-
-        return 1;
-}
-
-int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
-{
-        int ret;
-
-        spin_lock_irq(&cmd->t_state_lock);
-        ret = __transport_check_aborted_status(cmd, send_status);
-        spin_unlock_irq(&cmd->t_state_lock);
-
-        return ret;
-}
-EXPORT_SYMBOL(transport_check_aborted_status);
-
-void transport_send_task_abort(struct se_cmd *cmd)
-{
-        unsigned long flags;
-        int ret;
-
-        spin_lock_irqsave(&cmd->t_state_lock, flags);
-        if (cmd->se_cmd_flags & (SCF_SENT_CHECK_CONDITION)) {
-                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                return;
-        }
-        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-
-        /*
-         * If there are still expected incoming fabric WRITEs, we wait
-         * until until they have completed before sending a TASK_ABORTED
-         * response.  This response with TASK_ABORTED status will be
-         * queued back to fabric module by transport_check_aborted_status().
-         */
-        if (cmd->data_direction == DMA_TO_DEVICE) {
-                if (cmd->se_tfo->write_pending_status(cmd) != 0) {
-                        spin_lock_irqsave(&cmd->t_state_lock, flags);
-                        if (cmd->se_cmd_flags & SCF_SEND_DELAYED_TAS) {
-                                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                                goto send_abort;
-                        }
-                        cmd->se_cmd_flags |= SCF_SEND_DELAYED_TAS;
-                        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                        return;
-                }
-        }
-send_abort:
-        cmd->scsi_status = SAM_STAT_TASK_ABORTED;
-
-        transport_lun_remove_cmd(cmd);
-
-        pr_debug("Setting SAM_STAT_TASK_ABORTED status for CDB: 0x%02x, ITT: 0x%08llx\n",
-                 cmd->t_task_cdb[0], cmd->tag);
-
-        trace_target_cmd_complete(cmd);
-        ret = cmd->se_tfo->queue_status(cmd);
-        if (ret)
-                transport_handle_queue_full(cmd, cmd->se_dev, ret, false);
-}
-
 static void target_tmr_work(struct work_struct *work)
 {
         struct se_cmd *cmd = container_of(work, struct se_cmd, work);
         struct se_device *dev = cmd->se_dev;
         struct se_tmr_req *tmr = cmd->se_tmr_req;
-        unsigned long flags;
         int ret;
 
-        spin_lock_irqsave(&cmd->t_state_lock, flags);
-        if (cmd->transport_state & CMD_T_ABORTED) {
-                tmr->response = TMR_FUNCTION_REJECTED;
-                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                goto check_stop;
-        }
-        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+        if (cmd->transport_state & CMD_T_ABORTED)
+                goto aborted;
 
         switch (tmr->function) {
         case TMR_ABORT_TASK:
@@ -3386,18 +3315,16 @@ static void target_tmr_work(struct work_struct *work)
                 break;
         }
 
-        spin_lock_irqsave(&cmd->t_state_lock, flags);
-        if (cmd->transport_state & CMD_T_ABORTED) {
-                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                goto check_stop;
-        }
-        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+        if (cmd->transport_state & CMD_T_ABORTED)
+                goto aborted;
 
         cmd->se_tfo->queue_tm_rsp(cmd);
 
-check_stop:
-        transport_lun_remove_cmd(cmd);
         transport_cmd_check_stop_to_fabric(cmd);
+        return;
+
+aborted:
+        target_handle_abort(cmd);
 }
 
 int transport_generic_handle_tmr(
@@ -3416,16 +3343,15 @@ int transport_generic_handle_tmr(
         spin_unlock_irqrestore(&cmd->t_state_lock, flags);
 
         if (aborted) {
-                pr_warn_ratelimited("handle_tmr caught CMD_T_ABORTED TMR %d"
-                        "ref_tag: %llu tag: %llu\n", cmd->se_tmr_req->function,
-                        cmd->se_tmr_req->ref_task_tag, cmd->tag);
-                transport_lun_remove_cmd(cmd);
-                transport_cmd_check_stop_to_fabric(cmd);
+                pr_warn_ratelimited("handle_tmr caught CMD_T_ABORTED TMR %d ref_tag: %llu tag: %llu\n",
+                                    cmd->se_tmr_req->function,
+                                    cmd->se_tmr_req->ref_task_tag, cmd->tag);
+                target_handle_abort(cmd);
                 return 0;
         }
 
         INIT_WORK(&cmd->work, target_tmr_work);
-        queue_work(cmd->se_dev->tmr_wq, &cmd->work);
+        schedule_work(&cmd->work);
         return 0;
 }
 EXPORT_SYMBOL(transport_generic_handle_tmr);
diff --git a/drivers/target/target_core_ua.c b/drivers/target/target_core_ua.c
index c8ac242ce888..ced1c10364eb 100644
--- a/drivers/target/target_core_ua.c
+++ b/drivers/target/target_core_ua.c
@@ -266,7 +266,7 @@ bool core_scsi3_ua_for_check_condition(struct se_cmd *cmd, u8 *key, u8 *asc,
         pr_debug("[%s]: %s UNIT ATTENTION condition with"
                 " INTLCK_CTRL: %d, mapped LUN: %llu, got CDB: 0x%02x"
                 " reported ASC: 0x%02x, ASCQ: 0x%02x\n",
-                nacl->se_tpg->se_tpg_tfo->get_fabric_name(),
+                nacl->se_tpg->se_tpg_tfo->fabric_name,
                 (dev->dev_attrib.emulate_ua_intlck_ctrl != 0) ? "Reporting" :
                 "Releasing", dev->dev_attrib.emulate_ua_intlck_ctrl,
                 cmd->orig_fe_lun, cmd->t_task_cdb[0], *asc, *ascq);
@@ -327,7 +327,7 @@ int core_scsi3_ua_clear_for_request_sense(
 
         pr_debug("[%s]: Released UNIT ATTENTION condition, mapped"
                 " LUN: %llu, got REQUEST_SENSE reported ASC: 0x%02x,"
-                " ASCQ: 0x%02x\n", nacl->se_tpg->se_tpg_tfo->get_fabric_name(),
+                " ASCQ: 0x%02x\n", nacl->se_tpg->se_tpg_tfo->fabric_name,
                 cmd->orig_fe_lun, *asc, *ascq);
 
         return (head) ? -EPERM : 0;
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 9cd404acdb82..1e6d24943565 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -958,7 +958,7 @@ static int add_to_cmdr_queue(struct tcmu_cmd *tcmu_cmd)
  *  0 success
  *  1 internally queued to wait for ring memory to free.
  */
-static sense_reason_t queue_cmd_ring(struct tcmu_cmd *tcmu_cmd, int *scsi_err)
+static int queue_cmd_ring(struct tcmu_cmd *tcmu_cmd, sense_reason_t *scsi_err)
 {
         struct tcmu_dev *udev = tcmu_cmd->tcmu_dev;
         struct se_cmd *se_cmd = tcmu_cmd->se_cmd;
diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c
index 70adcfdca8d1..c2e1fc927fdf 100644
--- a/drivers/target/target_core_xcopy.c
+++ b/drivers/target/target_core_xcopy.c
@@ -399,11 +399,6 @@ struct se_portal_group xcopy_pt_tpg;
 static struct se_session xcopy_pt_sess;
 static struct se_node_acl xcopy_pt_nacl;
 
-static char *xcopy_pt_get_fabric_name(void)
-{
-        return "xcopy-pt";
-}
-
 static int xcopy_pt_get_cmd_state(struct se_cmd *se_cmd)
 {
         return 0;
@@ -463,7 +458,7 @@ static int xcopy_pt_queue_status(struct se_cmd *se_cmd)
 }
 
 static const struct target_core_fabric_ops xcopy_pt_tfo = {
-        .get_fabric_name        = xcopy_pt_get_fabric_name,
+        .fabric_name            = "xcopy-pt",
         .get_cmd_state          = xcopy_pt_get_cmd_state,
         .release_cmd            = xcopy_pt_release_cmd,
         .check_stop_free        = xcopy_pt_check_stop_free,
@@ -479,6 +474,8 @@ static const struct target_core_fabric_ops xcopy_pt_tfo = {
 
 int target_xcopy_setup_pt(void)
 {
+        int ret;
+
         xcopy_wq = alloc_workqueue("xcopy_wq", WQ_MEM_RECLAIM, 0);
         if (!xcopy_wq) {
                 pr_err("Unable to allocate xcopy_wq\n");
@@ -496,7 +493,9 @@ int target_xcopy_setup_pt(void)
         INIT_LIST_HEAD(&xcopy_pt_nacl.acl_list);
         INIT_LIST_HEAD(&xcopy_pt_nacl.acl_sess_list);
         memset(&xcopy_pt_sess, 0, sizeof(struct se_session));
-        transport_init_session(&xcopy_pt_sess);
+        ret = transport_init_session(&xcopy_pt_sess);
+        if (ret < 0)
+                return ret;
 
         xcopy_pt_nacl.se_tpg = &xcopy_pt_tpg;
         xcopy_pt_nacl.nacl_sess = &xcopy_pt_sess;
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index e55c4d537592..1ce49518d440 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -392,11 +392,6 @@ static inline struct ft_tpg *ft_tpg(struct se_portal_group *se_tpg)
         return container_of(se_tpg, struct ft_tpg, se_tpg);
 }
 
-static char *ft_get_fabric_name(void)
-{
-        return "fc";
-}
-
 static char *ft_get_fabric_wwn(struct se_portal_group *se_tpg)
 {
         return ft_tpg(se_tpg)->lport_wwn->name;
@@ -427,9 +422,8 @@ static u32 ft_tpg_get_inst_index(struct se_portal_group *se_tpg)
 
 static const struct target_core_fabric_ops ft_fabric_ops = {
         .module =                       THIS_MODULE,
-        .name =                         "fc",
+        .fabric_name =                  "fc",
         .node_acl_size =                sizeof(struct ft_node_acl),
-        .get_fabric_name =              ft_get_fabric_name,
         .tpg_get_wwn =                  ft_get_fabric_wwn,
         .tpg_get_tag =                  ft_get_tag,
         .tpg_check_demo_mode =          ft_check_false,