target: Use array_zalloc for tpg_lun_list
[linux-2.6.git] / drivers / target / target_core_device.c
index fc10ed4..fd7f17c 100644 (file)
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Filename:  target_core_device.c (based on iscsi_target_device.c)
  *
- * This file contains the iSCSI Virtual Device and Disk Transport
+ * This file contains the TCM Virtual Device and Disk Transport
  * agnostic related functions.
  *
  * Copyright (c) 2003, 2004, 2005 PyX Technologies, Inc.
 #include <linux/spinlock.h>
 #include <linux/kthread.h>
 #include <linux/in.h>
+#include <linux/export.h>
 #include <net/sock.h>
 #include <net/tcp.h>
 #include <scsi/scsi.h>
+#include <scsi/scsi_device.h>
 
 #include <target/target_core_base.h>
-#include <target/target_core_device.h>
-#include <target/target_core_tpg.h>
-#include <target/target_core_transport.h>
-#include <target/target_core_fabric_ops.h>
+#include <target/target_core_backend.h>
+#include <target/target_core_fabric.h>
 
+#include "target_core_internal.h"
 #include "target_core_alua.h"
-#include "target_core_hba.h"
 #include "target_core_pr.h"
 #include "target_core_ua.h"
 
 static void se_dev_start(struct se_device *dev);
 static void se_dev_stop(struct se_device *dev);
 
-int transport_get_lun_for_cmd(
-       struct se_cmd *se_cmd,
-       unsigned char *cdb,
-       u32 unpacked_lun)
+static struct se_hba *lun0_hba;
+static struct se_subsystem_dev *lun0_su_dev;
+/* not static, needed by tpg.c */
+struct se_device *g_lun0_dev;
+
+int transport_lookup_cmd_lun(struct se_cmd *se_cmd, u32 unpacked_lun)
 {
-       struct se_dev_entry *deve;
        struct se_lun *se_lun = NULL;
-       struct se_session *se_sess = SE_SESS(se_cmd);
+       struct se_session *se_sess = se_cmd->se_sess;
+       struct se_device *dev;
        unsigned long flags;
-       int read_only = 0;
 
-       spin_lock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
-       deve = se_cmd->se_deve =
-                       &SE_NODE_ACL(se_sess)->device_list[unpacked_lun];
-       if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) {
-               if (se_cmd) {
-                       deve->total_cmds++;
-                       deve->total_bytes += se_cmd->data_length;
-
-                       if (se_cmd->data_direction == DMA_TO_DEVICE) {
-                               if (deve->lun_flags &
-                                               TRANSPORT_LUNFLAGS_READ_ONLY) {
-                                       read_only = 1;
-                                       goto out;
-                               }
-                               deve->write_bytes += se_cmd->data_length;
-                       } else if (se_cmd->data_direction ==
-                                  DMA_FROM_DEVICE) {
-                               deve->read_bytes += se_cmd->data_length;
-                       }
+       if (unpacked_lun >= TRANSPORT_MAX_LUNS_PER_TPG) {
+               se_cmd->scsi_sense_reason = TCM_NON_EXISTENT_LUN;
+               se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+               return -ENODEV;
+       }
+
+       spin_lock_irqsave(&se_sess->se_node_acl->device_list_lock, flags);
+       se_cmd->se_deve = &se_sess->se_node_acl->device_list[unpacked_lun];
+       if (se_cmd->se_deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) {
+               struct se_dev_entry *deve = se_cmd->se_deve;
+
+               deve->total_cmds++;
+               deve->total_bytes += se_cmd->data_length;
+
+               if ((se_cmd->data_direction == DMA_TO_DEVICE) &&
+                   (deve->lun_flags & TRANSPORT_LUNFLAGS_READ_ONLY)) {
+                       se_cmd->scsi_sense_reason = TCM_WRITE_PROTECTED;
+                       se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                       pr_err("TARGET_CORE[%s]: Detected WRITE_PROTECTED LUN"
+                               " Access for 0x%08x\n",
+                               se_cmd->se_tfo->get_fabric_name(),
+                               unpacked_lun);
+                       spin_unlock_irqrestore(&se_sess->se_node_acl->device_list_lock, flags);
+                       return -EACCES;
                }
+
+               if (se_cmd->data_direction == DMA_TO_DEVICE)
+                       deve->write_bytes += se_cmd->data_length;
+               else if (se_cmd->data_direction == DMA_FROM_DEVICE)
+                       deve->read_bytes += se_cmd->data_length;
+
                deve->deve_cmds++;
 
-               se_lun = se_cmd->se_lun = deve->se_lun;
+               se_lun = deve->se_lun;
+               se_cmd->se_lun = deve->se_lun;
                se_cmd->pr_res_key = deve->pr_res_key;
                se_cmd->orig_fe_lun = unpacked_lun;
-               se_cmd->se_orig_obj_ptr = SE_LUN(se_cmd)->lun_se_dev;
                se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
        }
-out:
-       spin_unlock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
+       spin_unlock_irqrestore(&se_sess->se_node_acl->device_list_lock, flags);
 
        if (!se_lun) {
-               if (read_only) {
-                       se_cmd->scsi_sense_reason = TCM_WRITE_PROTECTED;
+               /*
+                * Use the se_portal_group->tpg_virt_lun0 to allow for
+                * REPORT_LUNS, et al to be returned when no active
+                * MappedLUN=0 exists for this Initiator Port.
+                */
+               if (unpacked_lun != 0) {
+                       se_cmd->scsi_sense_reason = TCM_NON_EXISTENT_LUN;
                        se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
-                       printk("TARGET_CORE[%s]: Detected WRITE_PROTECTED LUN"
+                       pr_err("TARGET_CORE[%s]: Detected NON_EXISTENT_LUN"
                                " Access for 0x%08x\n",
-                               CMD_TFO(se_cmd)->get_fabric_name(),
+                               se_cmd->se_tfo->get_fabric_name(),
                                unpacked_lun);
-                       return -1;
-               } else {
-                       /*
-                        * Use the se_portal_group->tpg_virt_lun0 to allow for
-                        * REPORT_LUNS, et al to be returned when no active
-                        * MappedLUN=0 exists for this Initiator Port.
-                        */
-                       if (unpacked_lun != 0) {
-                               se_cmd->scsi_sense_reason = TCM_NON_EXISTENT_LUN;
-                               se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
-                               printk("TARGET_CORE[%s]: Detected NON_EXISTENT_LUN"
-                                       " Access for 0x%08x\n",
-                                       CMD_TFO(se_cmd)->get_fabric_name(),
-                                       unpacked_lun);
-                               return -1;
-                       }
-                       /*
-                        * Force WRITE PROTECT for virtual LUN 0
-                        */
-                       if ((se_cmd->data_direction != DMA_FROM_DEVICE) &&
-                           (se_cmd->data_direction != DMA_NONE)) {
-                               se_cmd->scsi_sense_reason = TCM_WRITE_PROTECTED;
-                               se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
-                               return -1;
-                       }
-#if 0
-                       printk("TARGET_CORE[%s]: Using virtual LUN0! :-)\n",
-                               CMD_TFO(se_cmd)->get_fabric_name());
-#endif
-                       se_lun = se_cmd->se_lun = &se_sess->se_tpg->tpg_virt_lun0;
-                       se_cmd->orig_fe_lun = 0;
-                       se_cmd->se_orig_obj_ptr = SE_LUN(se_cmd)->lun_se_dev;
-                       se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
+                       return -ENODEV;
                }
+               /*
+                * Force WRITE PROTECT for virtual LUN 0
+                */
+               if ((se_cmd->data_direction != DMA_FROM_DEVICE) &&
+                   (se_cmd->data_direction != DMA_NONE)) {
+                       se_cmd->scsi_sense_reason = TCM_WRITE_PROTECTED;
+                       se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                       return -EACCES;
+               }
+
+               se_lun = &se_sess->se_tpg->tpg_virt_lun0;
+               se_cmd->se_lun = &se_sess->se_tpg->tpg_virt_lun0;
+               se_cmd->orig_fe_lun = 0;
+               se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
        }
        /*
         * Determine if the struct se_lun is online.
+        * FIXME: Check for LUN_RESET + UNIT Attention
         */
-/* #warning FIXME: Check for LUN_RESET + UNIT Attention */
        if (se_dev_check_online(se_lun->lun_se_dev) != 0) {
                se_cmd->scsi_sense_reason = TCM_NON_EXISTENT_LUN;
                se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
-               return -1;
+               return -ENODEV;
        }
 
-       {
-       struct se_device *dev = se_lun->lun_se_dev;
-       spin_lock_irq(&dev->stats_lock);
+       /* Directly associate cmd with se_dev */
+       se_cmd->se_dev = se_lun->lun_se_dev;
+
+       /* TODO: get rid of this and use atomics for stats */
+       dev = se_lun->lun_se_dev;
+       spin_lock_irqsave(&dev->stats_lock, flags);
        dev->num_cmds++;
        if (se_cmd->data_direction == DMA_TO_DEVICE)
                dev->write_bytes += se_cmd->data_length;
        else if (se_cmd->data_direction == DMA_FROM_DEVICE)
                dev->read_bytes += se_cmd->data_length;
-       spin_unlock_irq(&dev->stats_lock);
-       }
+       spin_unlock_irqrestore(&dev->stats_lock, flags);
 
-       /*
-        * Add the iscsi_cmd_t to the struct se_lun's cmd list.  This list is used
-        * for tracking state of struct se_cmds during LUN shutdown events.
-        */
        spin_lock_irqsave(&se_lun->lun_cmd_lock, flags);
-       list_add_tail(&se_cmd->se_lun_list, &se_lun->lun_cmd_list);
-       atomic_set(&T_TASK(se_cmd)->transport_lun_active, 1);
-#if 0
-       printk(KERN_INFO "Adding ITT: 0x%08x to LUN LIST[%d]\n",
-               CMD_TFO(se_cmd)->get_task_tag(se_cmd), se_lun->unpacked_lun);
-#endif
+       list_add_tail(&se_cmd->se_lun_node, &se_lun->lun_cmd_list);
        spin_unlock_irqrestore(&se_lun->lun_cmd_lock, flags);
 
        return 0;
 }
-EXPORT_SYMBOL(transport_get_lun_for_cmd);
+EXPORT_SYMBOL(transport_lookup_cmd_lun);
 
-int transport_get_lun_for_tmr(
-       struct se_cmd *se_cmd,
-       u32 unpacked_lun)
+int transport_lookup_tmr_lun(struct se_cmd *se_cmd, u32 unpacked_lun)
 {
-       struct se_device *dev = NULL;
        struct se_dev_entry *deve;
        struct se_lun *se_lun = NULL;
-       struct se_session *se_sess = SE_SESS(se_cmd);
+       struct se_session *se_sess = se_cmd->se_sess;
        struct se_tmr_req *se_tmr = se_cmd->se_tmr_req;
+       unsigned long flags;
+
+       if (unpacked_lun >= TRANSPORT_MAX_LUNS_PER_TPG) {
+               se_cmd->scsi_sense_reason = TCM_NON_EXISTENT_LUN;
+               se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+               return -ENODEV;
+       }
+
+       spin_lock_irqsave(&se_sess->se_node_acl->device_list_lock, flags);
+       se_cmd->se_deve = &se_sess->se_node_acl->device_list[unpacked_lun];
+       deve = se_cmd->se_deve;
 
-       spin_lock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
-       deve = se_cmd->se_deve =
-                       &SE_NODE_ACL(se_sess)->device_list[unpacked_lun];
        if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) {
-               se_lun = se_cmd->se_lun = se_tmr->tmr_lun = deve->se_lun;
-               dev = se_tmr->tmr_dev = se_lun->lun_se_dev;
+               se_tmr->tmr_lun = deve->se_lun;
+               se_cmd->se_lun = deve->se_lun;
+               se_lun = deve->se_lun;
                se_cmd->pr_res_key = deve->pr_res_key;
                se_cmd->orig_fe_lun = unpacked_lun;
-               se_cmd->se_orig_obj_ptr = SE_LUN(se_cmd)->lun_se_dev;
-/*             se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD; */
        }
-       spin_unlock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
+       spin_unlock_irqrestore(&se_sess->se_node_acl->device_list_lock, flags);
 
        if (!se_lun) {
-               printk(KERN_INFO "TARGET_CORE[%s]: Detected NON_EXISTENT_LUN"
+               pr_debug("TARGET_CORE[%s]: Detected NON_EXISTENT_LUN"
                        " Access for 0x%08x\n",
-                       CMD_TFO(se_cmd)->get_fabric_name(),
+                       se_cmd->se_tfo->get_fabric_name(),
                        unpacked_lun);
                se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
-               return -1;
+               return -ENODEV;
        }
        /*
         * Determine if the struct se_lun is online.
+        * FIXME: Check for LUN_RESET + UNIT Attention
         */
-/* #warning FIXME: Check for LUN_RESET + UNIT Attention */
        if (se_dev_check_online(se_lun->lun_se_dev) != 0) {
                se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
-               return -1;
+               return -ENODEV;
        }
 
-       spin_lock(&dev->se_tmr_lock);
-       list_add_tail(&se_tmr->tmr_list, &dev->dev_tmr_list);
-       spin_unlock(&dev->se_tmr_lock);
+       /* Directly associate cmd with se_dev */
+       se_cmd->se_dev = se_lun->lun_se_dev;
+       se_tmr->tmr_dev = se_lun->lun_se_dev;
+
+       spin_lock_irqsave(&se_tmr->tmr_dev->se_tmr_lock, flags);
+       list_add_tail(&se_tmr->tmr_list, &se_tmr->tmr_dev->dev_tmr_list);
+       spin_unlock_irqrestore(&se_tmr->tmr_dev->se_tmr_lock, flags);
 
        return 0;
 }
-EXPORT_SYMBOL(transport_get_lun_for_tmr);
+EXPORT_SYMBOL(transport_lookup_tmr_lun);
 
 /*
  * This function is called from core_scsi3_emulate_pro_register_and_move()
@@ -247,17 +246,17 @@ struct se_dev_entry *core_get_se_deve_from_rtpi(
                        continue;
 
                lun = deve->se_lun;
-               if (!(lun)) {
-                       printk(KERN_ERR "%s device entries device pointer is"
+               if (!lun) {
+                       pr_err("%s device entries device pointer is"
                                " NULL, but Initiator has access.\n",
-                               TPG_TFO(tpg)->get_fabric_name());
+                               tpg->se_tpg_tfo->get_fabric_name());
                        continue;
                }
                port = lun->lun_sep;
-               if (!(port)) {
-                       printk(KERN_ERR "%s device entries device pointer is"
+               if (!port) {
+                       pr_err("%s device entries device pointer is"
                                " NULL, but Initiator has access.\n",
-                               TPG_TFO(tpg)->get_fabric_name());
+                               tpg->se_tpg_tfo->get_fabric_name());
                        continue;
                }
                if (port->sep_rtpi != rtpi)
@@ -293,9 +292,9 @@ int core_free_device_list_for_node(
                        continue;
 
                if (!deve->se_lun) {
-                       printk(KERN_ERR "%s device entries device pointer is"
+                       pr_err("%s device entries device pointer is"
                                " NULL, but Initiator has access.\n",
-                               TPG_TFO(tpg)->get_fabric_name());
+                               tpg->se_tpg_tfo->get_fabric_name());
                        continue;
                }
                lun = deve->se_lun;
@@ -316,13 +315,12 @@ int core_free_device_list_for_node(
 void core_dec_lacl_count(struct se_node_acl *se_nacl, struct se_cmd *se_cmd)
 {
        struct se_dev_entry *deve;
+       unsigned long flags;
 
-       spin_lock_irq(&se_nacl->device_list_lock);
+       spin_lock_irqsave(&se_nacl->device_list_lock, flags);
        deve = &se_nacl->device_list[se_cmd->orig_fe_lun];
        deve->deve_cmds--;
-       spin_unlock_irq(&se_nacl->device_list_lock);
-
-       return;
+       spin_unlock_irqrestore(&se_nacl->device_list_lock, flags);
 }
 
 void core_update_device_list_access(
@@ -342,8 +340,6 @@ void core_update_device_list_access(
                deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_ONLY;
        }
        spin_unlock_irq(&nacl->device_list_lock);
-
-       return;
 }
 
 /*      core_update_device_list_for_node():
@@ -368,7 +364,7 @@ int core_update_device_list_for_node(
         * struct se_dev_entry pointers below as logic in
         * core_alua_do_transition_tg_pt() depends on these being present.
         */
-       if (!(enable)) {
+       if (!enable) {
                /*
                 * deve->se_lun_acl will be NULL for demo-mode created LUNs
                 * that have not been explicitly concerted to MappedLUNs ->
@@ -391,18 +387,18 @@ int core_update_device_list_for_node(
                 */
                if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) {
                        if (deve->se_lun_acl != NULL) {
-                               printk(KERN_ERR "struct se_dev_entry->se_lun_acl"
+                               pr_err("struct se_dev_entry->se_lun_acl"
                                        " already set for demo mode -> explict"
                                        " LUN ACL transition\n");
                                spin_unlock_irq(&nacl->device_list_lock);
-                               return -1;
+                               return -EINVAL;
                        }
                        if (deve->se_lun != lun) {
-                               printk(KERN_ERR "struct se_dev_entry->se_lun does"
+                               pr_err("struct se_dev_entry->se_lun does"
                                        " match passed struct se_lun for demo mode"
                                        " -> explict LUN ACL transition\n");
                                spin_unlock_irq(&nacl->device_list_lock);
-                               return -1;
+                               return -EINVAL;
                        }
                        deve->se_lun_acl = lun_acl;
                        trans = 1;
@@ -468,9 +464,9 @@ void core_clear_lun_from_tpg(struct se_lun *lun, struct se_portal_group *tpg)
        struct se_dev_entry *deve;
        u32 i;
 
-       spin_lock_bh(&tpg->acl_node_lock);
+       spin_lock_irq(&tpg->acl_node_lock);
        list_for_each_entry(nacl, &tpg->acl_node_list, acl_list) {
-               spin_unlock_bh(&tpg->acl_node_lock);
+               spin_unlock_irq(&tpg->acl_node_lock);
 
                spin_lock_irq(&nacl->device_list_lock);
                for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
@@ -487,11 +483,9 @@ void core_clear_lun_from_tpg(struct se_lun *lun, struct se_portal_group *tpg)
                }
                spin_unlock_irq(&nacl->device_list_lock);
 
-               spin_lock_bh(&tpg->acl_node_lock);
+               spin_lock_irq(&tpg->acl_node_lock);
        }
-       spin_unlock_bh(&tpg->acl_node_lock);
-
-       return;
+       spin_unlock_irq(&tpg->acl_node_lock);
 }
 
 static struct se_port *core_alloc_port(struct se_device *dev)
@@ -499,9 +493,9 @@ static struct se_port *core_alloc_port(struct se_device *dev)
        struct se_port *port, *port_tmp;
 
        port = kzalloc(sizeof(struct se_port), GFP_KERNEL);
-       if (!(port)) {
-               printk(KERN_ERR "Unable to allocate struct se_port\n");
-               return NULL;
+       if (!port) {
+               pr_err("Unable to allocate struct se_port\n");
+               return ERR_PTR(-ENOMEM);
        }
        INIT_LIST_HEAD(&port->sep_alua_list);
        INIT_LIST_HEAD(&port->sep_list);
@@ -511,10 +505,10 @@ static struct se_port *core_alloc_port(struct se_device *dev)
 
        spin_lock(&dev->se_port_lock);
        if (dev->dev_port_count == 0x0000ffff) {
-               printk(KERN_WARNING "Reached dev->dev_port_count =="
+               pr_warn("Reached dev->dev_port_count =="
                                " 0x0000ffff\n");
                spin_unlock(&dev->se_port_lock);
-               return NULL;
+               return ERR_PTR(-ENOSPC);
        }
 again:
        /*
@@ -530,7 +524,7 @@ again:
         * 3h to FFFFh    Relative port 3 through 65 535
         */
        port->sep_rtpi = dev->dev_rpti_counter++;
-       if (!(port->sep_rtpi))
+       if (!port->sep_rtpi)
                goto again;
 
        list_for_each_entry(port_tmp, &dev->dev_sep_list, sep_list) {
@@ -552,7 +546,7 @@ static void core_export_port(
        struct se_port *port,
        struct se_lun *lun)
 {
-       struct se_subsystem_dev *su_dev = SU_DEV(dev);
+       struct se_subsystem_dev *su_dev = dev->se_sub_dev;
        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem = NULL;
 
        spin_lock(&dev->se_port_lock);
@@ -565,20 +559,20 @@ static void core_export_port(
        list_add_tail(&port->sep_list, &dev->dev_sep_list);
        spin_unlock(&dev->se_port_lock);
 
-       if (T10_ALUA(su_dev)->alua_type == SPC3_ALUA_EMULATED) {
+       if (su_dev->t10_alua.alua_type == SPC3_ALUA_EMULATED) {
                tg_pt_gp_mem = core_alua_allocate_tg_pt_gp_mem(port);
                if (IS_ERR(tg_pt_gp_mem) || !tg_pt_gp_mem) {
-                       printk(KERN_ERR "Unable to allocate t10_alua_tg_pt"
+                       pr_err("Unable to allocate t10_alua_tg_pt"
                                        "_gp_member_t\n");
                        return;
                }
                spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
                __core_alua_attach_tg_pt_gp_mem(tg_pt_gp_mem,
-                       T10_ALUA(su_dev)->default_tg_pt_gp);
+                       su_dev->t10_alua.default_tg_pt_gp);
                spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
-               printk(KERN_INFO "%s/%s: Adding to default ALUA Target Port"
+               pr_debug("%s/%s: Adding to default ALUA Target Port"
                        " Group: alua/default_tg_pt_gp\n",
-                       TRANSPORT(dev)->name, TPG_TFO(tpg)->get_fabric_name());
+                       dev->transport->name, tpg->se_tpg_tfo->get_fabric_name());
        }
 
        dev->dev_port_count++;
@@ -605,8 +599,6 @@ static void core_release_port(struct se_device *dev, struct se_port *port)
        list_del(&port->sep_list);
        dev->dev_port_count--;
        kfree(port);
-
-       return;
 }
 
 int core_dev_export(
@@ -617,8 +609,8 @@ int core_dev_export(
        struct se_port *port;
 
        port = core_alloc_port(dev);
-       if (!(port))
-               return -1;
+       if (IS_ERR(port))
+               return PTR_ERR(port);
 
        lun->lun_se_dev = dev;
        se_dev_start(dev);
@@ -651,46 +643,33 @@ void core_dev_unexport(
        lun->lun_se_dev = NULL;
 }
 
-int transport_core_report_lun_response(struct se_cmd *se_cmd)
+int target_report_luns(struct se_task *se_task)
 {
+       struct se_cmd *se_cmd = se_task->task_se_cmd;
        struct se_dev_entry *deve;
        struct se_lun *se_lun;
-       struct se_session *se_sess = SE_SESS(se_cmd);
-       struct se_task *se_task;
-       unsigned char *buf = (unsigned char *)T_TASK(se_cmd)->t_task_buf;
-       u32 cdb_offset = 0, lun_count = 0, offset = 8;
-       u64 i, lun;
+       struct se_session *se_sess = se_cmd->se_sess;
+       unsigned char *buf;
+       u32 lun_count = 0, offset = 8, i;
 
-       list_for_each_entry(se_task, &T_TASK(se_cmd)->t_task_list, t_list)
-               break;
-
-       if (!(se_task)) {
-               printk(KERN_ERR "Unable to locate struct se_task for struct se_cmd\n");
-               return PYX_TRANSPORT_LU_COMM_FAILURE;
-       }
+       buf = transport_kmap_data_sg(se_cmd);
+       if (!buf)
+               return -ENOMEM;
 
        /*
         * If no struct se_session pointer is present, this struct se_cmd is
         * coming via a target_core_mod PASSTHROUGH op, and not through
         * a $FABRIC_MOD.  In that case, report LUN=0 only.
         */
-       if (!(se_sess)) {
-               lun = 0;
-               buf[offset++] = ((lun >> 56) & 0xff);
-               buf[offset++] = ((lun >> 48) & 0xff);
-               buf[offset++] = ((lun >> 40) & 0xff);
-               buf[offset++] = ((lun >> 32) & 0xff);
-               buf[offset++] = ((lun >> 24) & 0xff);
-               buf[offset++] = ((lun >> 16) & 0xff);
-               buf[offset++] = ((lun >> 8) & 0xff);
-               buf[offset++] = (lun & 0xff);
+       if (!se_sess) {
+               int_to_scsilun(0, (struct scsi_lun *)&buf[offset]);
                lun_count = 1;
                goto done;
        }
 
-       spin_lock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
+       spin_lock_irq(&se_sess->se_node_acl->device_list_lock);
        for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
-               deve = &SE_NODE_ACL(se_sess)->device_list[i];
+               deve = &se_sess->se_node_acl->device_list[i];
                if (!(deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS))
                        continue;
                se_lun = deve->se_lun;
@@ -700,21 +679,13 @@ int transport_core_report_lun_response(struct se_cmd *se_cmd)
                 * See SPC2-R20 7.19.
                 */
                lun_count++;
-               if ((cdb_offset + 8) >= se_cmd->data_length)
+               if ((offset + 8) > se_cmd->data_length)
                        continue;
 
-               lun = cpu_to_be64(CMD_TFO(se_cmd)->pack_lun(deve->mapped_lun));
-               buf[offset++] = ((lun >> 56) & 0xff);
-               buf[offset++] = ((lun >> 48) & 0xff);
-               buf[offset++] = ((lun >> 40) & 0xff);
-               buf[offset++] = ((lun >> 32) & 0xff);
-               buf[offset++] = ((lun >> 24) & 0xff);
-               buf[offset++] = ((lun >> 16) & 0xff);
-               buf[offset++] = ((lun >> 8) & 0xff);
-               buf[offset++] = (lun & 0xff);
-               cdb_offset += 8;
+               int_to_scsilun(deve->mapped_lun, (struct scsi_lun *)&buf[offset]);
+               offset += 8;
        }
-       spin_unlock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
+       spin_unlock_irq(&se_sess->se_node_acl->device_list_lock);
 
        /*
         * See SPC3 r07, page 159.
@@ -725,8 +696,11 @@ done:
        buf[1] = ((lun_count >> 16) & 0xff);
        buf[2] = ((lun_count >> 8) & 0xff);
        buf[3] = (lun_count & 0xff);
+       transport_kunmap_data_sg(se_cmd);
 
-       return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+       se_task->task_scsi_status = GOOD;
+       transport_complete_task(se_task, 1);
+       return 0;
 }
 
 /*     se_release_device_for_hba():
@@ -758,26 +732,20 @@ void se_release_device_for_hba(struct se_device *dev)
        core_scsi3_free_all_registrations(dev);
        se_release_vpd_for_dev(dev);
 
-       kfree(dev->dev_status_queue_obj);
-       kfree(dev->dev_queue_obj);
        kfree(dev);
-
-       return;
 }
 
 void se_release_vpd_for_dev(struct se_device *dev)
 {
        struct t10_vpd *vpd, *vpd_tmp;
 
-       spin_lock(&DEV_T10_WWN(dev)->t10_vpd_lock);
+       spin_lock(&dev->se_sub_dev->t10_wwn.t10_vpd_lock);
        list_for_each_entry_safe(vpd, vpd_tmp,
-                       &DEV_T10_WWN(dev)->t10_vpd_list, vpd_list) {
+                       &dev->se_sub_dev->t10_wwn.t10_vpd_list, vpd_list) {
                list_del(&vpd->vpd_list);
                kfree(vpd);
        }
-       spin_unlock(&DEV_T10_WWN(dev)->t10_vpd_lock);
-
-       return;
+       spin_unlock(&dev->se_sub_dev->t10_wwn.t10_vpd_lock);
 }
 
 /*     se_free_virtual_device():
@@ -836,12 +804,13 @@ static void se_dev_stop(struct se_device *dev)
 
 int se_dev_check_online(struct se_device *dev)
 {
+       unsigned long flags;
        int ret;
 
-       spin_lock_irq(&dev->dev_status_lock);
+       spin_lock_irqsave(&dev->dev_status_lock, flags);
        ret = ((dev->dev_status & TRANSPORT_DEVICE_ACTIVATED) ||
               (dev->dev_status & TRANSPORT_DEVICE_DEACTIVATED)) ? 0 : 1;
-       spin_unlock_irq(&dev->dev_status_lock);
+       spin_unlock_irqrestore(&dev->dev_status_lock, flags);
 
        return ret;
 }
@@ -857,78 +826,93 @@ int se_dev_check_shutdown(struct se_device *dev)
        return ret;
 }
 
+u32 se_dev_align_max_sectors(u32 max_sectors, u32 block_size)
+{
+       u32 tmp, aligned_max_sectors;
+       /*
+        * Limit max_sectors to a PAGE_SIZE aligned value for modern
+        * transport_allocate_data_tasks() operation.
+        */
+       tmp = rounddown((max_sectors * block_size), PAGE_SIZE);
+       aligned_max_sectors = (tmp / block_size);
+       if (max_sectors != aligned_max_sectors) {
+               printk(KERN_INFO "Rounding down aligned max_sectors from %u"
+                               " to %u\n", max_sectors, aligned_max_sectors);
+               return aligned_max_sectors;
+       }
+
+       return max_sectors;
+}
+
 void se_dev_set_default_attribs(
        struct se_device *dev,
        struct se_dev_limits *dev_limits)
 {
        struct queue_limits *limits = &dev_limits->limits;
 
-       DEV_ATTRIB(dev)->emulate_dpo = DA_EMULATE_DPO;
-       DEV_ATTRIB(dev)->emulate_fua_write = DA_EMULATE_FUA_WRITE;
-       DEV_ATTRIB(dev)->emulate_fua_read = DA_EMULATE_FUA_READ;
-       DEV_ATTRIB(dev)->emulate_write_cache = DA_EMULATE_WRITE_CACHE;
-       DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl = DA_EMULATE_UA_INTLLCK_CTRL;
-       DEV_ATTRIB(dev)->emulate_tas = DA_EMULATE_TAS;
-       DEV_ATTRIB(dev)->emulate_tpu = DA_EMULATE_TPU;
-       DEV_ATTRIB(dev)->emulate_tpws = DA_EMULATE_TPWS;
-       DEV_ATTRIB(dev)->emulate_reservations = DA_EMULATE_RESERVATIONS;
-       DEV_ATTRIB(dev)->emulate_alua = DA_EMULATE_ALUA;
-       DEV_ATTRIB(dev)->enforce_pr_isids = DA_ENFORCE_PR_ISIDS;
+       dev->se_sub_dev->se_dev_attrib.emulate_dpo = DA_EMULATE_DPO;
+       dev->se_sub_dev->se_dev_attrib.emulate_fua_write = DA_EMULATE_FUA_WRITE;
+       dev->se_sub_dev->se_dev_attrib.emulate_fua_read = DA_EMULATE_FUA_READ;
+       dev->se_sub_dev->se_dev_attrib.emulate_write_cache = DA_EMULATE_WRITE_CACHE;
+       dev->se_sub_dev->se_dev_attrib.emulate_ua_intlck_ctrl = DA_EMULATE_UA_INTLLCK_CTRL;
+       dev->se_sub_dev->se_dev_attrib.emulate_tas = DA_EMULATE_TAS;
+       dev->se_sub_dev->se_dev_attrib.emulate_tpu = DA_EMULATE_TPU;
+       dev->se_sub_dev->se_dev_attrib.emulate_tpws = DA_EMULATE_TPWS;
+       dev->se_sub_dev->se_dev_attrib.emulate_reservations = DA_EMULATE_RESERVATIONS;
+       dev->se_sub_dev->se_dev_attrib.emulate_alua = DA_EMULATE_ALUA;
+       dev->se_sub_dev->se_dev_attrib.enforce_pr_isids = DA_ENFORCE_PR_ISIDS;
+       dev->se_sub_dev->se_dev_attrib.is_nonrot = DA_IS_NONROT;
+       dev->se_sub_dev->se_dev_attrib.emulate_rest_reord = DA_EMULATE_REST_REORD;
        /*
         * The TPU=1 and TPWS=1 settings will be set in TCM/IBLOCK
         * iblock_create_virtdevice() from struct queue_limits values
         * if blk_queue_discard()==1
         */
-       DEV_ATTRIB(dev)->max_unmap_lba_count = DA_MAX_UNMAP_LBA_COUNT;
-       DEV_ATTRIB(dev)->max_unmap_block_desc_count =
-                               DA_MAX_UNMAP_BLOCK_DESC_COUNT;
-       DEV_ATTRIB(dev)->unmap_granularity = DA_UNMAP_GRANULARITY_DEFAULT;
-       DEV_ATTRIB(dev)->unmap_granularity_alignment =
+       dev->se_sub_dev->se_dev_attrib.max_unmap_lba_count = DA_MAX_UNMAP_LBA_COUNT;
+       dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count =
+               DA_MAX_UNMAP_BLOCK_DESC_COUNT;
+       dev->se_sub_dev->se_dev_attrib.unmap_granularity = DA_UNMAP_GRANULARITY_DEFAULT;
+       dev->se_sub_dev->se_dev_attrib.unmap_granularity_alignment =
                                DA_UNMAP_GRANULARITY_ALIGNMENT_DEFAULT;
        /*
         * block_size is based on subsystem plugin dependent requirements.
         */
-       DEV_ATTRIB(dev)->hw_block_size = limits->logical_block_size;
-       DEV_ATTRIB(dev)->block_size = limits->logical_block_size;
+       dev->se_sub_dev->se_dev_attrib.hw_block_size = limits->logical_block_size;
+       dev->se_sub_dev->se_dev_attrib.block_size = limits->logical_block_size;
        /*
         * max_sectors is based on subsystem plugin dependent requirements.
         */
-       DEV_ATTRIB(dev)->hw_max_sectors = limits->max_hw_sectors;
-       DEV_ATTRIB(dev)->max_sectors = limits->max_sectors;
+       dev->se_sub_dev->se_dev_attrib.hw_max_sectors = limits->max_hw_sectors;
        /*
-        * Set optimal_sectors from max_sectors, which can be lowered via
-        * configfs.
+        * Align max_sectors down to PAGE_SIZE to follow transport_allocate_data_tasks()
         */
-       DEV_ATTRIB(dev)->optimal_sectors = limits->max_sectors;
+       limits->max_sectors = se_dev_align_max_sectors(limits->max_sectors,
+                                               limits->logical_block_size);
+       dev->se_sub_dev->se_dev_attrib.max_sectors = limits->max_sectors;
+       /*
+        * Set fabric_max_sectors, which is reported in block limits
+        * VPD page (B0h).
+        */
+       dev->se_sub_dev->se_dev_attrib.fabric_max_sectors = DA_FABRIC_MAX_SECTORS;
+       /*
+        * Set optimal_sectors from fabric_max_sectors, which can be
+        * lowered via configfs.
+        */
+       dev->se_sub_dev->se_dev_attrib.optimal_sectors = DA_FABRIC_MAX_SECTORS;
        /*
         * queue_depth is based on subsystem plugin dependent requirements.
         */
-       DEV_ATTRIB(dev)->hw_queue_depth = dev_limits->hw_queue_depth;
-       DEV_ATTRIB(dev)->queue_depth = dev_limits->queue_depth;
-}
-
-int se_dev_set_task_timeout(struct se_device *dev, u32 task_timeout)
-{
-       if (task_timeout > DA_TASK_TIMEOUT_MAX) {
-               printk(KERN_ERR "dev[%p]: Passed task_timeout: %u larger then"
-                       " DA_TASK_TIMEOUT_MAX\n", dev, task_timeout);
-               return -1;
-       } else {
-               DEV_ATTRIB(dev)->task_timeout = task_timeout;
-               printk(KERN_INFO "dev[%p]: Set SE Device task_timeout: %u\n",
-                       dev, task_timeout);
-       }
-
-       return 0;
+       dev->se_sub_dev->se_dev_attrib.hw_queue_depth = dev_limits->hw_queue_depth;
+       dev->se_sub_dev->se_dev_attrib.queue_depth = dev_limits->queue_depth;
 }
 
 int se_dev_set_max_unmap_lba_count(
        struct se_device *dev,
        u32 max_unmap_lba_count)
 {
-       DEV_ATTRIB(dev)->max_unmap_lba_count = max_unmap_lba_count;
-       printk(KERN_INFO "dev[%p]: Set max_unmap_lba_count: %u\n",
-                       dev, DEV_ATTRIB(dev)->max_unmap_lba_count);
+       dev->se_sub_dev->se_dev_attrib.max_unmap_lba_count = max_unmap_lba_count;
+       pr_debug("dev[%p]: Set max_unmap_lba_count: %u\n",
+                       dev, dev->se_sub_dev->se_dev_attrib.max_unmap_lba_count);
        return 0;
 }
 
@@ -936,9 +920,10 @@ int se_dev_set_max_unmap_block_desc_count(
        struct se_device *dev,
        u32 max_unmap_block_desc_count)
 {
-       DEV_ATTRIB(dev)->max_unmap_block_desc_count = max_unmap_block_desc_count;
-       printk(KERN_INFO "dev[%p]: Set max_unmap_block_desc_count: %u\n",
-                       dev, DEV_ATTRIB(dev)->max_unmap_block_desc_count);
+       dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count =
+               max_unmap_block_desc_count;
+       pr_debug("dev[%p]: Set max_unmap_block_desc_count: %u\n",
+                       dev, dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count);
        return 0;
 }
 
@@ -946,9 +931,9 @@ int se_dev_set_unmap_granularity(
        struct se_device *dev,
        u32 unmap_granularity)
 {
-       DEV_ATTRIB(dev)->unmap_granularity = unmap_granularity;
-       printk(KERN_INFO "dev[%p]: Set unmap_granularity: %u\n",
-                       dev, DEV_ATTRIB(dev)->unmap_granularity);
+       dev->se_sub_dev->se_dev_attrib.unmap_granularity = unmap_granularity;
+       pr_debug("dev[%p]: Set unmap_granularity: %u\n",
+                       dev, dev->se_sub_dev->se_dev_attrib.unmap_granularity);
        return 0;
 }
 
@@ -956,109 +941,92 @@ int se_dev_set_unmap_granularity_alignment(
        struct se_device *dev,
        u32 unmap_granularity_alignment)
 {
-       DEV_ATTRIB(dev)->unmap_granularity_alignment = unmap_granularity_alignment;
-       printk(KERN_INFO "dev[%p]: Set unmap_granularity_alignment: %u\n",
-                       dev, DEV_ATTRIB(dev)->unmap_granularity_alignment);
+       dev->se_sub_dev->se_dev_attrib.unmap_granularity_alignment = unmap_granularity_alignment;
+       pr_debug("dev[%p]: Set unmap_granularity_alignment: %u\n",
+                       dev, dev->se_sub_dev->se_dev_attrib.unmap_granularity_alignment);
        return 0;
 }
 
 int se_dev_set_emulate_dpo(struct se_device *dev, int flag)
 {
-       if ((flag != 0) && (flag != 1)) {
-               printk(KERN_ERR "Illegal value %d\n", flag);
-               return -1;
-       }
-       if (TRANSPORT(dev)->dpo_emulated == NULL) {
-               printk(KERN_ERR "TRANSPORT(dev)->dpo_emulated is NULL\n");
-               return -1;
+       if (flag != 0 && flag != 1) {
+               pr_err("Illegal value %d\n", flag);
+               return -EINVAL;
        }
-       if (TRANSPORT(dev)->dpo_emulated(dev) == 0) {
-               printk(KERN_ERR "TRANSPORT(dev)->dpo_emulated not supported\n");
-               return -1;
+
+       if (flag) {
+               pr_err("dpo_emulated not supported\n");
+               return -EINVAL;
        }
-       DEV_ATTRIB(dev)->emulate_dpo = flag;
-       printk(KERN_INFO "dev[%p]: SE Device Page Out (DPO) Emulation"
-                       " bit: %d\n", dev, DEV_ATTRIB(dev)->emulate_dpo);
+
        return 0;
 }
 
 int se_dev_set_emulate_fua_write(struct se_device *dev, int flag)
 {
-       if ((flag != 0) && (flag != 1)) {
-               printk(KERN_ERR "Illegal value %d\n", flag);
-               return -1;
-       }
-       if (TRANSPORT(dev)->fua_write_emulated == NULL) {
-               printk(KERN_ERR "TRANSPORT(dev)->fua_write_emulated is NULL\n");
-               return -1;
+       if (flag != 0 && flag != 1) {
+               pr_err("Illegal value %d\n", flag);
+               return -EINVAL;
        }
-       if (TRANSPORT(dev)->fua_write_emulated(dev) == 0) {
-               printk(KERN_ERR "TRANSPORT(dev)->fua_write_emulated not supported\n");
-               return -1;
+
+       if (flag && dev->transport->fua_write_emulated == 0) {
+               pr_err("fua_write_emulated not supported\n");
+               return -EINVAL;
        }
-       DEV_ATTRIB(dev)->emulate_fua_write = flag;
-       printk(KERN_INFO "dev[%p]: SE Device Forced Unit Access WRITEs: %d\n",
-                       dev, DEV_ATTRIB(dev)->emulate_fua_write);
+       dev->se_sub_dev->se_dev_attrib.emulate_fua_write = flag;
+       pr_debug("dev[%p]: SE Device Forced Unit Access WRITEs: %d\n",
+                       dev, dev->se_sub_dev->se_dev_attrib.emulate_fua_write);
        return 0;
 }
 
 int se_dev_set_emulate_fua_read(struct se_device *dev, int flag)
 {
-       if ((flag != 0) && (flag != 1)) {
-               printk(KERN_ERR "Illegal value %d\n", flag);
-               return -1;
-       }
-       if (TRANSPORT(dev)->fua_read_emulated == NULL) {
-               printk(KERN_ERR "TRANSPORT(dev)->fua_read_emulated is NULL\n");
-               return -1;
+       if (flag != 0 && flag != 1) {
+               pr_err("Illegal value %d\n", flag);
+               return -EINVAL;
        }
-       if (TRANSPORT(dev)->fua_read_emulated(dev) == 0) {
-               printk(KERN_ERR "TRANSPORT(dev)->fua_read_emulated not supported\n");
-               return -1;
+
+       if (flag) {
+               pr_err("ua read emulated not supported\n");
+               return -EINVAL;
        }
-       DEV_ATTRIB(dev)->emulate_fua_read = flag;
-       printk(KERN_INFO "dev[%p]: SE Device Forced Unit Access READs: %d\n",
-                       dev, DEV_ATTRIB(dev)->emulate_fua_read);
+
        return 0;
 }
 
 int se_dev_set_emulate_write_cache(struct se_device *dev, int flag)
 {
-       if ((flag != 0) && (flag != 1)) {
-               printk(KERN_ERR "Illegal value %d\n", flag);
-               return -1;
-       }
-       if (TRANSPORT(dev)->write_cache_emulated == NULL) {
-               printk(KERN_ERR "TRANSPORT(dev)->write_cache_emulated is NULL\n");
-               return -1;
+       if (flag != 0 && flag != 1) {
+               pr_err("Illegal value %d\n", flag);
+               return -EINVAL;
        }
-       if (TRANSPORT(dev)->write_cache_emulated(dev) == 0) {
-               printk(KERN_ERR "TRANSPORT(dev)->write_cache_emulated not supported\n");
-               return -1;
+       if (flag && dev->transport->write_cache_emulated == 0) {
+               pr_err("write_cache_emulated not supported\n");
+               return -EINVAL;
        }
-       DEV_ATTRIB(dev)->emulate_write_cache = flag;
-       printk(KERN_INFO "dev[%p]: SE Device WRITE_CACHE_EMULATION flag: %d\n",
-                       dev, DEV_ATTRIB(dev)->emulate_write_cache);
+       dev->se_sub_dev->se_dev_attrib.emulate_write_cache = flag;
+       pr_debug("dev[%p]: SE Device WRITE_CACHE_EMULATION flag: %d\n",
+                       dev, dev->se_sub_dev->se_dev_attrib.emulate_write_cache);
        return 0;
 }
 
 int se_dev_set_emulate_ua_intlck_ctrl(struct se_device *dev, int flag)
 {
        if ((flag != 0) && (flag != 1) && (flag != 2)) {
-               printk(KERN_ERR "Illegal value %d\n", flag);
-               return -1;
+               pr_err("Illegal value %d\n", flag);
+               return -EINVAL;
        }
 
        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
-               printk(KERN_ERR "dev[%p]: Unable to change SE Device"
+               pr_err("dev[%p]: Unable to change SE Device"
                        " UA_INTRLCK_CTRL while dev_export_obj: %d count"
                        " exists\n", dev,
                        atomic_read(&dev->dev_export_obj.obj_access_count));
-               return -1;
+               return -EINVAL;
        }
-       DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl = flag;
-       printk(KERN_INFO "dev[%p]: SE Device UA_INTRLCK_CTRL flag: %d\n",
-               dev, DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl);
+       dev->se_sub_dev->se_dev_attrib.emulate_ua_intlck_ctrl = flag;
+       pr_debug("dev[%p]: SE Device UA_INTRLCK_CTRL flag: %d\n",
+               dev, dev->se_sub_dev->se_dev_attrib.emulate_ua_intlck_ctrl);
 
        return 0;
 }
@@ -1066,19 +1034,19 @@ int se_dev_set_emulate_ua_intlck_ctrl(struct se_device *dev, int flag)
 int se_dev_set_emulate_tas(struct se_device *dev, int flag)
 {
        if ((flag != 0) && (flag != 1)) {
-               printk(KERN_ERR "Illegal value %d\n", flag);
-               return -1;
+               pr_err("Illegal value %d\n", flag);
+               return -EINVAL;
        }
 
        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
-               printk(KERN_ERR "dev[%p]: Unable to change SE Device TAS while"
+               pr_err("dev[%p]: Unable to change SE Device TAS while"
                        " dev_export_obj: %d count exists\n", dev,
                        atomic_read(&dev->dev_export_obj.obj_access_count));
-               return -1;
+               return -EINVAL;
        }
-       DEV_ATTRIB(dev)->emulate_tas = flag;
-       printk(KERN_INFO "dev[%p]: SE Device TASK_ABORTED status bit: %s\n",
-               dev, (DEV_ATTRIB(dev)->emulate_tas) ? "Enabled" : "Disabled");
+       dev->se_sub_dev->se_dev_attrib.emulate_tas = flag;
+       pr_debug("dev[%p]: SE Device TASK_ABORTED status bit: %s\n",
+               dev, (dev->se_sub_dev->se_dev_attrib.emulate_tas) ? "Enabled" : "Disabled");
 
        return 0;
 }
@@ -1086,20 +1054,20 @@ int se_dev_set_emulate_tas(struct se_device *dev, int flag)
 int se_dev_set_emulate_tpu(struct se_device *dev, int flag)
 {
        if ((flag != 0) && (flag != 1)) {
-               printk(KERN_ERR "Illegal value %d\n", flag);
-               return -1;
+               pr_err("Illegal value %d\n", flag);
+               return -EINVAL;
        }
        /*
         * We expect this value to be non-zero when generic Block Layer
         * Discard supported is detected iblock_create_virtdevice().
         */
-       if (!(DEV_ATTRIB(dev)->max_unmap_block_desc_count)) {
-               printk(KERN_ERR "Generic Block Discard not supported\n");
+       if (flag && !dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count) {
+               pr_err("Generic Block Discard not supported\n");
                return -ENOSYS;
        }
 
-       DEV_ATTRIB(dev)->emulate_tpu = flag;
-       printk(KERN_INFO "dev[%p]: SE Device Thin Provisioning UNMAP bit: %d\n",
+       dev->se_sub_dev->se_dev_attrib.emulate_tpu = flag;
+       pr_debug("dev[%p]: SE Device Thin Provisioning UNMAP bit: %d\n",
                                dev, flag);
        return 0;
 }
@@ -1107,20 +1075,20 @@ int se_dev_set_emulate_tpu(struct se_device *dev, int flag)
 int se_dev_set_emulate_tpws(struct se_device *dev, int flag)
 {
        if ((flag != 0) && (flag != 1)) {
-               printk(KERN_ERR "Illegal value %d\n", flag);
-               return -1;
+               pr_err("Illegal value %d\n", flag);
+               return -EINVAL;
        }
        /*
         * We expect this value to be non-zero when generic Block Layer
         * Discard supported is detected iblock_create_virtdevice().
         */
-       if (!(DEV_ATTRIB(dev)->max_unmap_block_desc_count)) {
-               printk(KERN_ERR "Generic Block Discard not supported\n");
+       if (flag && !dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count) {
+               pr_err("Generic Block Discard not supported\n");
                return -ENOSYS;
        }
 
-       DEV_ATTRIB(dev)->emulate_tpws = flag;
-       printk(KERN_INFO "dev[%p]: SE Device Thin Provisioning WRITE_SAME: %d\n",
+       dev->se_sub_dev->se_dev_attrib.emulate_tpws = flag;
+       pr_debug("dev[%p]: SE Device Thin Provisioning WRITE_SAME: %d\n",
                                dev, flag);
        return 0;
 }
@@ -1128,12 +1096,36 @@ int se_dev_set_emulate_tpws(struct se_device *dev, int flag)
 int se_dev_set_enforce_pr_isids(struct se_device *dev, int flag)
 {
        if ((flag != 0) && (flag != 1)) {
+               pr_err("Illegal value %d\n", flag);
+               return -EINVAL;
+       }
+       dev->se_sub_dev->se_dev_attrib.enforce_pr_isids = flag;
+       pr_debug("dev[%p]: SE Device enforce_pr_isids bit: %s\n", dev,
+               (dev->se_sub_dev->se_dev_attrib.enforce_pr_isids) ? "Enabled" : "Disabled");
+       return 0;
+}
+
+int se_dev_set_is_nonrot(struct se_device *dev, int flag)
+{
+       if ((flag != 0) && (flag != 1)) {
                printk(KERN_ERR "Illegal value %d\n", flag);
-               return -1;
+               return -EINVAL;
        }
-       DEV_ATTRIB(dev)->enforce_pr_isids = flag;
-       printk(KERN_INFO "dev[%p]: SE Device enforce_pr_isids bit: %s\n", dev,
-               (DEV_ATTRIB(dev)->enforce_pr_isids) ? "Enabled" : "Disabled");
+       dev->se_sub_dev->se_dev_attrib.is_nonrot = flag;
+       pr_debug("dev[%p]: SE Device is_nonrot bit: %d\n",
+              dev, flag);
+       return 0;
+}
+
+int se_dev_set_emulate_rest_reord(struct se_device *dev, int flag)
+{
+       if (flag != 0) {
+               printk(KERN_ERR "dev[%p]: SE Device emulatation of restricted"
+                       " reordering not implemented\n", dev);
+               return -ENOSYS;
+       }
+       dev->se_sub_dev->se_dev_attrib.emulate_rest_reord = flag;
+       pr_debug("dev[%p]: SE Device emulate_rest_reord: %d\n", dev, flag);
        return 0;
 }
 
@@ -1142,47 +1134,40 @@ int se_dev_set_enforce_pr_isids(struct se_device *dev, int flag)
  */
 int se_dev_set_queue_depth(struct se_device *dev, u32 queue_depth)
 {
-       u32 orig_queue_depth = dev->queue_depth;
-
        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
-               printk(KERN_ERR "dev[%p]: Unable to change SE Device TCQ while"
+               pr_err("dev[%p]: Unable to change SE Device TCQ while"
                        " dev_export_obj: %d count exists\n", dev,
                        atomic_read(&dev->dev_export_obj.obj_access_count));
-               return -1;
+               return -EINVAL;
        }
-       if (!(queue_depth)) {
-               printk(KERN_ERR "dev[%p]: Illegal ZERO value for queue"
+       if (!queue_depth) {
+               pr_err("dev[%p]: Illegal ZERO value for queue"
                        "_depth\n", dev);
-               return -1;
+               return -EINVAL;
        }
 
-       if (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
-               if (queue_depth > DEV_ATTRIB(dev)->hw_queue_depth) {
-                       printk(KERN_ERR "dev[%p]: Passed queue_depth: %u"
+       if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+               if (queue_depth > dev->se_sub_dev->se_dev_attrib.hw_queue_depth) {
+                       pr_err("dev[%p]: Passed queue_depth: %u"
                                " exceeds TCM/SE_Device TCQ: %u\n",
                                dev, queue_depth,
-                               DEV_ATTRIB(dev)->hw_queue_depth);
-                       return -1;
+                               dev->se_sub_dev->se_dev_attrib.hw_queue_depth);
+                       return -EINVAL;
                }
        } else {
-               if (queue_depth > DEV_ATTRIB(dev)->queue_depth) {
-                       if (queue_depth > DEV_ATTRIB(dev)->hw_queue_depth) {
-                               printk(KERN_ERR "dev[%p]: Passed queue_depth:"
+               if (queue_depth > dev->se_sub_dev->se_dev_attrib.queue_depth) {
+                       if (queue_depth > dev->se_sub_dev->se_dev_attrib.hw_queue_depth) {
+                               pr_err("dev[%p]: Passed queue_depth:"
                                        " %u exceeds TCM/SE_Device MAX"
                                        " TCQ: %u\n", dev, queue_depth,
-                                       DEV_ATTRIB(dev)->hw_queue_depth);
-                               return -1;
+                                       dev->se_sub_dev->se_dev_attrib.hw_queue_depth);
+                               return -EINVAL;
                        }
                }
        }
 
-       DEV_ATTRIB(dev)->queue_depth = dev->queue_depth = queue_depth;
-       if (queue_depth > orig_queue_depth)
-               atomic_add(queue_depth - orig_queue_depth, &dev->depth_left);
-       else if (queue_depth < orig_queue_depth)
-               atomic_sub(orig_queue_depth - queue_depth, &dev->depth_left);
-
-       printk(KERN_INFO "dev[%p]: SE Device TCQ Depth changed to: %u\n",
+       dev->se_sub_dev->se_dev_attrib.queue_depth = dev->queue_depth = queue_depth;
+       pr_debug("dev[%p]: SE Device TCQ Depth changed to: %u\n",
                        dev, queue_depth);
        return 0;
 }
@@ -1192,76 +1177,129 @@ int se_dev_set_max_sectors(struct se_device *dev, u32 max_sectors)
        int force = 0; /* Force setting for VDEVS */
 
        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
-               printk(KERN_ERR "dev[%p]: Unable to change SE Device"
+               pr_err("dev[%p]: Unable to change SE Device"
                        " max_sectors while dev_export_obj: %d count exists\n",
                        dev, atomic_read(&dev->dev_export_obj.obj_access_count));
-               return -1;
+               return -EINVAL;
        }
-       if (!(max_sectors)) {
-               printk(KERN_ERR "dev[%p]: Illegal ZERO value for"
+       if (!max_sectors) {
+               pr_err("dev[%p]: Illegal ZERO value for"
                        " max_sectors\n", dev);
-               return -1;
+               return -EINVAL;
        }
        if (max_sectors < DA_STATUS_MAX_SECTORS_MIN) {
-               printk(KERN_ERR "dev[%p]: Passed max_sectors: %u less than"
+               pr_err("dev[%p]: Passed max_sectors: %u less than"
                        " DA_STATUS_MAX_SECTORS_MIN: %u\n", dev, max_sectors,
                                DA_STATUS_MAX_SECTORS_MIN);
-               return -1;
+               return -EINVAL;
        }
-       if (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
-               if (max_sectors > DEV_ATTRIB(dev)->hw_max_sectors) {
-                       printk(KERN_ERR "dev[%p]: Passed max_sectors: %u"
+       if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+               if (max_sectors > dev->se_sub_dev->se_dev_attrib.hw_max_sectors) {
+                       pr_err("dev[%p]: Passed max_sectors: %u"
                                " greater than TCM/SE_Device max_sectors:"
                                " %u\n", dev, max_sectors,
-                               DEV_ATTRIB(dev)->hw_max_sectors);
-                        return -1;
+                               dev->se_sub_dev->se_dev_attrib.hw_max_sectors);
+                        return -EINVAL;
                }
        } else {
-               if (!(force) && (max_sectors >
-                                DEV_ATTRIB(dev)->hw_max_sectors)) {
-                       printk(KERN_ERR "dev[%p]: Passed max_sectors: %u"
+               if (!force && (max_sectors >
+                                dev->se_sub_dev->se_dev_attrib.hw_max_sectors)) {
+                       pr_err("dev[%p]: Passed max_sectors: %u"
                                " greater than TCM/SE_Device max_sectors"
                                ": %u, use force=1 to override.\n", dev,
-                               max_sectors, DEV_ATTRIB(dev)->hw_max_sectors);
-                       return -1;
+                               max_sectors, dev->se_sub_dev->se_dev_attrib.hw_max_sectors);
+                       return -EINVAL;
                }
                if (max_sectors > DA_STATUS_MAX_SECTORS_MAX) {
-                       printk(KERN_ERR "dev[%p]: Passed max_sectors: %u"
+                       pr_err("dev[%p]: Passed max_sectors: %u"
                                " greater than DA_STATUS_MAX_SECTORS_MAX:"
                                " %u\n", dev, max_sectors,
                                DA_STATUS_MAX_SECTORS_MAX);
-                       return -1;
+                       return -EINVAL;
                }
        }
+       /*
+        * Align max_sectors down to PAGE_SIZE to follow transport_allocate_data_tasks()
+        */
+       max_sectors = se_dev_align_max_sectors(max_sectors,
+                               dev->se_sub_dev->se_dev_attrib.block_size);
 
-       DEV_ATTRIB(dev)->max_sectors = max_sectors;
-       printk("dev[%p]: SE Device max_sectors changed to %u\n",
+       dev->se_sub_dev->se_dev_attrib.max_sectors = max_sectors;
+       pr_debug("dev[%p]: SE Device max_sectors changed to %u\n",
                        dev, max_sectors);
        return 0;
 }
 
+int se_dev_set_fabric_max_sectors(struct se_device *dev, u32 fabric_max_sectors)
+{
+       if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
+               pr_err("dev[%p]: Unable to change SE Device"
+                       " fabric_max_sectors while dev_export_obj: %d count exists\n",
+                       dev, atomic_read(&dev->dev_export_obj.obj_access_count));
+               return -EINVAL;
+       }
+       if (!fabric_max_sectors) {
+               pr_err("dev[%p]: Illegal ZERO value for"
+                       " fabric_max_sectors\n", dev);
+               return -EINVAL;
+       }
+       if (fabric_max_sectors < DA_STATUS_MAX_SECTORS_MIN) {
+               pr_err("dev[%p]: Passed fabric_max_sectors: %u less than"
+                       " DA_STATUS_MAX_SECTORS_MIN: %u\n", dev, fabric_max_sectors,
+                               DA_STATUS_MAX_SECTORS_MIN);
+               return -EINVAL;
+       }
+       if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+               if (fabric_max_sectors > dev->se_sub_dev->se_dev_attrib.hw_max_sectors) {
+                       pr_err("dev[%p]: Passed fabric_max_sectors: %u"
+                               " greater than TCM/SE_Device max_sectors:"
+                               " %u\n", dev, fabric_max_sectors,
+                               dev->se_sub_dev->se_dev_attrib.hw_max_sectors);
+                        return -EINVAL;
+               }
+       } else {
+               if (fabric_max_sectors > DA_STATUS_MAX_SECTORS_MAX) {
+                       pr_err("dev[%p]: Passed fabric_max_sectors: %u"
+                               " greater than DA_STATUS_MAX_SECTORS_MAX:"
+                               " %u\n", dev, fabric_max_sectors,
+                               DA_STATUS_MAX_SECTORS_MAX);
+                       return -EINVAL;
+               }
+       }
+       /*
+        * Align max_sectors down to PAGE_SIZE to follow transport_allocate_data_tasks()
+        */
+       fabric_max_sectors = se_dev_align_max_sectors(fabric_max_sectors,
+                                                     dev->se_sub_dev->se_dev_attrib.block_size);
+
+       dev->se_sub_dev->se_dev_attrib.fabric_max_sectors = fabric_max_sectors;
+       pr_debug("dev[%p]: SE Device max_sectors changed to %u\n",
+                       dev, fabric_max_sectors);
+       return 0;
+}
+
 int se_dev_set_optimal_sectors(struct se_device *dev, u32 optimal_sectors)
 {
        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
-               printk(KERN_ERR "dev[%p]: Unable to change SE Device"
+               pr_err("dev[%p]: Unable to change SE Device"
                        " optimal_sectors while dev_export_obj: %d count exists\n",
                        dev, atomic_read(&dev->dev_export_obj.obj_access_count));
                return -EINVAL;
        }
-       if (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
-               printk(KERN_ERR "dev[%p]: Passed optimal_sectors cannot be"
+       if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+               pr_err("dev[%p]: Passed optimal_sectors cannot be"
                                " changed for TCM/pSCSI\n", dev);
                return -EINVAL;
        }
-       if (optimal_sectors > DEV_ATTRIB(dev)->max_sectors) {
-               printk(KERN_ERR "dev[%p]: Passed optimal_sectors %u cannot be"
-                       " greater than max_sectors: %u\n", dev,
-                       optimal_sectors, DEV_ATTRIB(dev)->max_sectors);
+       if (optimal_sectors > dev->se_sub_dev->se_dev_attrib.fabric_max_sectors) {
+               pr_err("dev[%p]: Passed optimal_sectors %u cannot be"
+                       " greater than fabric_max_sectors: %u\n", dev,
+                       optimal_sectors, dev->se_sub_dev->se_dev_attrib.fabric_max_sectors);
                return -EINVAL;
        }
 
-       DEV_ATTRIB(dev)->optimal_sectors = optimal_sectors;
-       printk(KERN_INFO "dev[%p]: SE Device optimal_sectors changed to %u\n",
+       dev->se_sub_dev->se_dev_attrib.optimal_sectors = optimal_sectors;
+       pr_debug("dev[%p]: SE Device optimal_sectors changed to %u\n",
                        dev, optimal_sectors);
        return 0;
 }
@@ -1269,31 +1307,31 @@ int se_dev_set_optimal_sectors(struct se_device *dev, u32 optimal_sectors)
 int se_dev_set_block_size(struct se_device *dev, u32 block_size)
 {
        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
-               printk(KERN_ERR "dev[%p]: Unable to change SE Device block_size"
+               pr_err("dev[%p]: Unable to change SE Device block_size"
                        " while dev_export_obj: %d count exists\n", dev,
                        atomic_read(&dev->dev_export_obj.obj_access_count));
-               return -1;
+               return -EINVAL;
        }
 
        if ((block_size != 512) &&
            (block_size != 1024) &&
            (block_size != 2048) &&
            (block_size != 4096)) {
-               printk(KERN_ERR "dev[%p]: Illegal value for block_device: %u"
+               pr_err("dev[%p]: Illegal value for block_device: %u"
                        " for SE device, must be 512, 1024, 2048 or 4096\n",
                        dev, block_size);
-               return -1;
+               return -EINVAL;
        }
 
-       if (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
-               printk(KERN_ERR "dev[%p]: Not allowed to change block_size for"
+       if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+               pr_err("dev[%p]: Not allowed to change block_size for"
                        " Physical Device, use for Linux/SCSI to change"
                        " block_size for underlying hardware\n", dev);
-               return -1;
+               return -EINVAL;
        }
 
-       DEV_ATTRIB(dev)->block_size = block_size;
-       printk(KERN_INFO "dev[%p]: SE Device block_size changed to %u\n",
+       dev->se_sub_dev->se_dev_attrib.block_size = block_size;
+       pr_debug("dev[%p]: SE Device block_size changed to %u\n",
                        dev, block_size);
        return 0;
 }
@@ -1306,44 +1344,48 @@ struct se_lun *core_dev_add_lun(
 {
        struct se_lun *lun_p;
        u32 lun_access = 0;
+       int rc;
 
        if (atomic_read(&dev->dev_access_obj.obj_access_count) != 0) {
-               printk(KERN_ERR "Unable to export struct se_device while dev_access_obj: %d\n",
+               pr_err("Unable to export struct se_device while dev_access_obj: %d\n",
                        atomic_read(&dev->dev_access_obj.obj_access_count));
-               return NULL;
+               return ERR_PTR(-EACCES);
        }
 
        lun_p = core_tpg_pre_addlun(tpg, lun);
-       if ((IS_ERR(lun_p)) || !(lun_p))
-               return NULL;
+       if (IS_ERR(lun_p))
+               return lun_p;
 
        if (dev->dev_flags & DF_READ_ONLY)
                lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
        else
                lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
 
-       if (core_tpg_post_addlun(tpg, lun_p, lun_access, dev) < 0)
-               return NULL;
+       rc = core_tpg_post_addlun(tpg, lun_p, lun_access, dev);
+       if (rc < 0)
+               return ERR_PTR(rc);
 
-       printk(KERN_INFO "%s_TPG[%u]_LUN[%u] - Activated %s Logical Unit from"
-               " CORE HBA: %u\n", TPG_TFO(tpg)->get_fabric_name(),
-               TPG_TFO(tpg)->tpg_get_tag(tpg), lun_p->unpacked_lun,
-               TPG_TFO(tpg)->get_fabric_name(), hba->hba_id);
+       pr_debug("%s_TPG[%u]_LUN[%u] - Activated %s Logical Unit from"
+               " CORE HBA: %u\n", tpg->se_tpg_tfo->get_fabric_name(),
+               tpg->se_tpg_tfo->tpg_get_tag(tpg), lun_p->unpacked_lun,
+               tpg->se_tpg_tfo->get_fabric_name(), hba->hba_id);
        /*
         * Update LUN maps for dynamically added initiators when
         * generate_node_acl is enabled.
         */
-       if (TPG_TFO(tpg)->tpg_check_demo_mode(tpg)) {
+       if (tpg->se_tpg_tfo->tpg_check_demo_mode(tpg)) {
                struct se_node_acl *acl;
-               spin_lock_bh(&tpg->acl_node_lock);
+               spin_lock_irq(&tpg->acl_node_lock);
                list_for_each_entry(acl, &tpg->acl_node_list, acl_list) {
-                       if (acl->dynamic_node_acl) {
-                               spin_unlock_bh(&tpg->acl_node_lock);
+                       if (acl->dynamic_node_acl &&
+                           (!tpg->se_tpg_tfo->tpg_check_demo_mode_login_only ||
+                            !tpg->se_tpg_tfo->tpg_check_demo_mode_login_only(tpg))) {
+                               spin_unlock_irq(&tpg->acl_node_lock);
                                core_tpg_add_node_to_devs(acl, tpg);
-                               spin_lock_bh(&tpg->acl_node_lock);
+                               spin_lock_irq(&tpg->acl_node_lock);
                        }
                }
-               spin_unlock_bh(&tpg->acl_node_lock);
+               spin_unlock_irq(&tpg->acl_node_lock);
        }
 
        return lun_p;
@@ -1358,18 +1400,17 @@ int core_dev_del_lun(
        u32 unpacked_lun)
 {
        struct se_lun *lun;
-       int ret = 0;
 
-       lun = core_tpg_pre_dellun(tpg, unpacked_lun, &ret);
-       if (!(lun))
-               return ret;
+       lun = core_tpg_pre_dellun(tpg, unpacked_lun);
+       if (IS_ERR(lun))
+               return PTR_ERR(lun);
 
        core_tpg_post_dellun(tpg, lun);
 
-       printk(KERN_INFO "%s_TPG[%u]_LUN[%u] - Deactivated %s Logical Unit from"
-               " device object\n", TPG_TFO(tpg)->get_fabric_name(),
-               TPG_TFO(tpg)->tpg_get_tag(tpg), unpacked_lun,
-               TPG_TFO(tpg)->get_fabric_name());
+       pr_debug("%s_TPG[%u]_LUN[%u] - Deactivated %s Logical Unit from"
+               " device object\n", tpg->se_tpg_tfo->get_fabric_name(),
+               tpg->se_tpg_tfo->tpg_get_tag(tpg), unpacked_lun,
+               tpg->se_tpg_tfo->get_fabric_name());
 
        return 0;
 }
@@ -1380,21 +1421,21 @@ struct se_lun *core_get_lun_from_tpg(struct se_portal_group *tpg, u32 unpacked_l
 
        spin_lock(&tpg->tpg_lun_lock);
        if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
-               printk(KERN_ERR "%s LUN: %u exceeds TRANSPORT_MAX_LUNS"
+               pr_err("%s LUN: %u exceeds TRANSPORT_MAX_LUNS"
                        "_PER_TPG-1: %u for Target Portal Group: %hu\n",
-                       TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
+                       tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
                        TRANSPORT_MAX_LUNS_PER_TPG-1,
-                       TPG_TFO(tpg)->tpg_get_tag(tpg));
+                       tpg->se_tpg_tfo->tpg_get_tag(tpg));
                spin_unlock(&tpg->tpg_lun_lock);
                return NULL;
        }
-       lun = &tpg->tpg_lun_list[unpacked_lun];
+       lun = tpg->tpg_lun_list[unpacked_lun];
 
        if (lun->lun_status != TRANSPORT_LUN_STATUS_FREE) {
-               printk(KERN_ERR "%s Logical Unit Number: %u is not free on"
+               pr_err("%s Logical Unit Number: %u is not free on"
                        " Target Portal Group: %hu, ignoring request.\n",
-                       TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
-                       TPG_TFO(tpg)->tpg_get_tag(tpg));
+                       tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
+                       tpg->se_tpg_tfo->tpg_get_tag(tpg));
                spin_unlock(&tpg->tpg_lun_lock);
                return NULL;
        }
@@ -1413,21 +1454,21 @@ static struct se_lun *core_dev_get_lun(struct se_portal_group *tpg, u32 unpacked
 
        spin_lock(&tpg->tpg_lun_lock);
        if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
-               printk(KERN_ERR "%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER"
+               pr_err("%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER"
                        "_TPG-1: %u for Target Portal Group: %hu\n",
-                       TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
+                       tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
                        TRANSPORT_MAX_LUNS_PER_TPG-1,
-                       TPG_TFO(tpg)->tpg_get_tag(tpg));
+                       tpg->se_tpg_tfo->tpg_get_tag(tpg));
                spin_unlock(&tpg->tpg_lun_lock);
                return NULL;
        }
-       lun = &tpg->tpg_lun_list[unpacked_lun];
+       lun = tpg->tpg_lun_list[unpacked_lun];
 
        if (lun->lun_status != TRANSPORT_LUN_STATUS_ACTIVE) {
-               printk(KERN_ERR "%s Logical Unit Number: %u is not active on"
+               pr_err("%s Logical Unit Number: %u is not active on"
                        " Target Portal Group: %hu, ignoring request.\n",
-                       TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
-                       TPG_TFO(tpg)->tpg_get_tag(tpg));
+                       tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
+                       tpg->se_tpg_tfo->tpg_get_tag(tpg));
                spin_unlock(&tpg->tpg_lun_lock);
                return NULL;
        }
@@ -1445,20 +1486,20 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
        struct se_lun_acl *lacl;
        struct se_node_acl *nacl;
 
-       if (strlen(initiatorname) > TRANSPORT_IQN_LEN) {
-               printk(KERN_ERR "%s InitiatorName exceeds maximum size.\n",
-                       TPG_TFO(tpg)->get_fabric_name());
+       if (strlen(initiatorname) >= TRANSPORT_IQN_LEN) {
+               pr_err("%s InitiatorName exceeds maximum size.\n",
+                       tpg->se_tpg_tfo->get_fabric_name());
                *ret = -EOVERFLOW;
                return NULL;
        }
        nacl = core_tpg_get_initiator_node_acl(tpg, initiatorname);
-       if (!(nacl)) {
+       if (!nacl) {
                *ret = -EINVAL;
                return NULL;
        }
        lacl = kzalloc(sizeof(struct se_lun_acl), GFP_KERNEL);
-       if (!(lacl)) {
-               printk(KERN_ERR "Unable to allocate memory for struct se_lun_acl.\n");
+       if (!lacl) {
+               pr_err("Unable to allocate memory for struct se_lun_acl.\n");
                *ret = -ENOMEM;
                return NULL;
        }
@@ -1481,16 +1522,16 @@ int core_dev_add_initiator_node_lun_acl(
        struct se_node_acl *nacl;
 
        lun = core_dev_get_lun(tpg, unpacked_lun);
-       if (!(lun)) {
-               printk(KERN_ERR "%s Logical Unit Number: %u is not active on"
+       if (!lun) {
+               pr_err("%s Logical Unit Number: %u is not active on"
                        " Target Portal Group: %hu, ignoring request.\n",
-                       TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
-                       TPG_TFO(tpg)->tpg_get_tag(tpg));
+                       tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
+                       tpg->se_tpg_tfo->tpg_get_tag(tpg));
                return -EINVAL;
        }
 
        nacl = lacl->se_lun_nacl;
-       if (!(nacl))
+       if (!nacl)
                return -EINVAL;
 
        if ((lun->lun_access & TRANSPORT_LUNFLAGS_READ_ONLY) &&
@@ -1509,9 +1550,9 @@ int core_dev_add_initiator_node_lun_acl(
        smp_mb__after_atomic_inc();
        spin_unlock(&lun->lun_acl_lock);
 
-       printk(KERN_INFO "%s_TPG[%hu]_LUN[%u->%u] - Added %s ACL for "
-               " InitiatorNode: %s\n", TPG_TFO(tpg)->get_fabric_name(),
-               TPG_TFO(tpg)->tpg_get_tag(tpg), unpacked_lun, lacl->mapped_lun,
+       pr_debug("%s_TPG[%hu]_LUN[%u->%u] - Added %s ACL for "
+               " InitiatorNode: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+               tpg->se_tpg_tfo->tpg_get_tag(tpg), unpacked_lun, lacl->mapped_lun,
                (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) ? "RW" : "RO",
                lacl->initiatorname);
        /*
@@ -1534,7 +1575,7 @@ int core_dev_del_initiator_node_lun_acl(
        struct se_node_acl *nacl;
 
        nacl = lacl->se_lun_nacl;
-       if (!(nacl))
+       if (!nacl)
                return -EINVAL;
 
        spin_lock(&lun->lun_acl_lock);
@@ -1548,10 +1589,10 @@ int core_dev_del_initiator_node_lun_acl(
 
        lacl->se_lun = NULL;
 
-       printk(KERN_INFO "%s_TPG[%hu]_LUN[%u] - Removed ACL for"
+       pr_debug("%s_TPG[%hu]_LUN[%u] - Removed ACL for"
                " InitiatorNode: %s Mapped LUN: %u\n",
-               TPG_TFO(tpg)->get_fabric_name(),
-               TPG_TFO(tpg)->tpg_get_tag(tpg), lun->unpacked_lun,
+               tpg->se_tpg_tfo->get_fabric_name(),
+               tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
                lacl->initiatorname, lacl->mapped_lun);
 
        return 0;
@@ -1561,10 +1602,10 @@ void core_dev_free_initiator_node_lun_acl(
        struct se_portal_group *tpg,
        struct se_lun_acl *lacl)
 {
-       printk("%s_TPG[%hu] - Freeing ACL for %s InitiatorNode: %s"
-               " Mapped LUN: %u\n", TPG_TFO(tpg)->get_fabric_name(),
-               TPG_TFO(tpg)->tpg_get_tag(tpg),
-               TPG_TFO(tpg)->get_fabric_name(),
+       pr_debug("%s_TPG[%hu] - Freeing ACL for %s InitiatorNode: %s"
+               " Mapped LUN: %u\n", tpg->se_tpg_tfo->get_fabric_name(),
+               tpg->se_tpg_tfo->tpg_get_tag(tpg),
+               tpg->se_tpg_tfo->get_fabric_name(),
                lacl->initiatorname, lacl->mapped_lun);
 
        kfree(lacl);
@@ -1579,64 +1620,63 @@ int core_dev_setup_virtual_lun0(void)
        char buf[16];
        int ret;
 
-       hba = core_alloc_hba("rd_dr", 0, HBA_FLAGS_INTERNAL_USE);
+       hba = core_alloc_hba("rd_mcp", 0, HBA_FLAGS_INTERNAL_USE);
        if (IS_ERR(hba))
                return PTR_ERR(hba);
 
-       se_global->g_lun0_hba = hba;
+       lun0_hba = hba;
        t = hba->transport;
 
        se_dev = kzalloc(sizeof(struct se_subsystem_dev), GFP_KERNEL);
-       if (!(se_dev)) {
-               printk(KERN_ERR "Unable to allocate memory for"
+       if (!se_dev) {
+               pr_err("Unable to allocate memory for"
                                " struct se_subsystem_dev\n");
                ret = -ENOMEM;
                goto out;
        }
-       INIT_LIST_HEAD(&se_dev->g_se_dev_list);
        INIT_LIST_HEAD(&se_dev->t10_wwn.t10_vpd_list);
        spin_lock_init(&se_dev->t10_wwn.t10_vpd_lock);
-       INIT_LIST_HEAD(&se_dev->t10_reservation.registration_list);
-       INIT_LIST_HEAD(&se_dev->t10_reservation.aptpl_reg_list);
-       spin_lock_init(&se_dev->t10_reservation.registration_lock);
-       spin_lock_init(&se_dev->t10_reservation.aptpl_reg_lock);
+       INIT_LIST_HEAD(&se_dev->t10_pr.registration_list);
+       INIT_LIST_HEAD(&se_dev->t10_pr.aptpl_reg_list);
+       spin_lock_init(&se_dev->t10_pr.registration_lock);
+       spin_lock_init(&se_dev->t10_pr.aptpl_reg_lock);
        INIT_LIST_HEAD(&se_dev->t10_alua.tg_pt_gps_list);
        spin_lock_init(&se_dev->t10_alua.tg_pt_gps_lock);
        spin_lock_init(&se_dev->se_dev_lock);
-       se_dev->t10_reservation.pr_aptpl_buf_len = PR_APTPL_BUF_LEN;
+       se_dev->t10_pr.pr_aptpl_buf_len = PR_APTPL_BUF_LEN;
        se_dev->t10_wwn.t10_sub_dev = se_dev;
        se_dev->t10_alua.t10_sub_dev = se_dev;
        se_dev->se_dev_attrib.da_sub_dev = se_dev;
        se_dev->se_dev_hba = hba;
 
        se_dev->se_dev_su_ptr = t->allocate_virtdevice(hba, "virt_lun0");
-       if (!(se_dev->se_dev_su_ptr)) {
-               printk(KERN_ERR "Unable to locate subsystem dependent pointer"
+       if (!se_dev->se_dev_su_ptr) {
+               pr_err("Unable to locate subsystem dependent pointer"
                        " from allocate_virtdevice()\n");
                ret = -ENOMEM;
                goto out;
        }
-       se_global->g_lun0_su_dev = se_dev;
+       lun0_su_dev = se_dev;
 
        memset(buf, 0, 16);
        sprintf(buf, "rd_pages=8");
        t->set_configfs_dev_params(hba, se_dev, buf, sizeof(buf));
 
        dev = t->create_virtdevice(hba, se_dev, se_dev->se_dev_su_ptr);
-       if (!(dev) || IS_ERR(dev)) {
-               ret = -ENOMEM;
+       if (IS_ERR(dev)) {
+               ret = PTR_ERR(dev);
                goto out;
        }
        se_dev->se_dev_ptr = dev;
-       se_global->g_lun0_dev = dev;
+       g_lun0_dev = dev;
 
        return 0;
 out:
-       se_global->g_lun0_su_dev = NULL;
+       lun0_su_dev = NULL;
        kfree(se_dev);
-       if (se_global->g_lun0_hba) {
-               core_delete_hba(se_global->g_lun0_hba);
-               se_global->g_lun0_hba = NULL;
+       if (lun0_hba) {
+               core_delete_hba(lun0_hba);
+               lun0_hba = NULL;
        }
        return ret;
 }
@@ -1644,14 +1684,14 @@ out:
 
 void core_dev_release_virtual_lun0(void)
 {
-       struct se_hba *hba = se_global->g_lun0_hba;
-       struct se_subsystem_dev *su_dev = se_global->g_lun0_su_dev;
+       struct se_hba *hba = lun0_hba;
+       struct se_subsystem_dev *su_dev = lun0_su_dev;
 
-       if (!(hba))
+       if (!hba)
                return;
 
-       if (se_global->g_lun0_dev)
-               se_free_virtual_device(se_global->g_lun0_dev, hba);
+       if (g_lun0_dev)
+               se_free_virtual_device(g_lun0_dev, hba);
 
        kfree(su_dev);
        core_delete_hba(hba);