Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git] / drivers / target / target_core_alua.c
index 47abb42..98c98a3 100644 (file)
@@ -46,6 +46,14 @@ static int core_alua_set_tg_pt_secondary_state(
                struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem,
                struct se_port *port, int explict, int offline);
 
+static u16 alua_lu_gps_counter;
+static u32 alua_lu_gps_count;
+
+static DEFINE_SPINLOCK(lu_gps_lock);
+static LIST_HEAD(lu_gps_list);
+
+struct t10_alua_lu_gp *default_lu_gp;
+
 /*
  * REPORT_TARGET_PORT_GROUPS
  *
@@ -53,16 +61,18 @@ static int core_alua_set_tg_pt_secondary_state(
  */
 int core_emulate_report_target_port_groups(struct se_cmd *cmd)
 {
-       struct se_subsystem_dev *su_dev = SE_DEV(cmd)->se_sub_dev;
+       struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev;
        struct se_port *port;
        struct t10_alua_tg_pt_gp *tg_pt_gp;
        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
-       unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
+       unsigned char *buf;
        u32 rd_len = 0, off = 4; /* Skip over RESERVED area to first
                                    Target port group descriptor */
 
-       spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
-       list_for_each_entry(tg_pt_gp, &T10_ALUA(su_dev)->tg_pt_gps_list,
+       buf = transport_kmap_first_data_page(cmd);
+
+       spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
+       list_for_each_entry(tg_pt_gp, &su_dev->t10_alua.tg_pt_gps_list,
                        tg_pt_gp_list) {
                /*
                 * PREF: Preferred target port bit, determine if this
@@ -124,7 +134,7 @@ int core_emulate_report_target_port_groups(struct se_cmd *cmd)
                }
                spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
        }
-       spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+       spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
        /*
         * Set the RETURN DATA LENGTH set in the header of the DataIN Payload
         */
@@ -133,6 +143,8 @@ int core_emulate_report_target_port_groups(struct se_cmd *cmd)
        buf[2] = ((rd_len >> 8) & 0xff);
        buf[3] = (rd_len & 0xff);
 
+       transport_kunmap_first_data_page(cmd);
+
        return 0;
 }
 
@@ -143,45 +155,53 @@ int core_emulate_report_target_port_groups(struct se_cmd *cmd)
  */
 int core_emulate_set_target_port_groups(struct se_cmd *cmd)
 {
-       struct se_device *dev = SE_DEV(cmd);
-       struct se_subsystem_dev *su_dev = SE_DEV(cmd)->se_sub_dev;
-       struct se_port *port, *l_port = SE_LUN(cmd)->lun_sep;
-       struct se_node_acl *nacl = SE_SESS(cmd)->se_node_acl;
+       struct se_device *dev = cmd->se_dev;
+       struct se_subsystem_dev *su_dev = dev->se_sub_dev;
+       struct se_port *port, *l_port = cmd->se_lun->lun_sep;
+       struct se_node_acl *nacl = cmd->se_sess->se_node_acl;
        struct t10_alua_tg_pt_gp *tg_pt_gp = NULL, *l_tg_pt_gp;
        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem, *l_tg_pt_gp_mem;
-       unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
-       unsigned char *ptr = &buf[4]; /* Skip over RESERVED area in header */
+       unsigned char *buf;
+       unsigned char *ptr;
        u32 len = 4; /* Skip over RESERVED area in header */
        int alua_access_state, primary = 0, rc;
        u16 tg_pt_id, rtpi;
 
-       if (!(l_port))
+       if (!l_port)
                return PYX_TRANSPORT_LU_COMM_FAILURE;
+
+       buf = transport_kmap_first_data_page(cmd);
+
        /*
         * Determine if explict ALUA via SET_TARGET_PORT_GROUPS is allowed
         * for the local tg_pt_gp.
         */
        l_tg_pt_gp_mem = l_port->sep_alua_tg_pt_gp_mem;
-       if (!(l_tg_pt_gp_mem)) {
-               printk(KERN_ERR "Unable to access l_port->sep_alua_tg_pt_gp_mem\n");
-               return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+       if (!l_tg_pt_gp_mem) {
+               pr_err("Unable to access l_port->sep_alua_tg_pt_gp_mem\n");
+               rc = PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+               goto out;
        }
        spin_lock(&l_tg_pt_gp_mem->tg_pt_gp_mem_lock);
        l_tg_pt_gp = l_tg_pt_gp_mem->tg_pt_gp;
-       if (!(l_tg_pt_gp)) {
+       if (!l_tg_pt_gp) {
                spin_unlock(&l_tg_pt_gp_mem->tg_pt_gp_mem_lock);
-               printk(KERN_ERR "Unable to access *l_tg_pt_gp_mem->tg_pt_gp\n");
-               return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+               pr_err("Unable to access *l_tg_pt_gp_mem->tg_pt_gp\n");
+               rc = PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+               goto out;
        }
        rc = (l_tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_EXPLICT_ALUA);
        spin_unlock(&l_tg_pt_gp_mem->tg_pt_gp_mem_lock);
 
-       if (!(rc)) {
-               printk(KERN_INFO "Unable to process SET_TARGET_PORT_GROUPS"
+       if (!rc) {
+               pr_debug("Unable to process SET_TARGET_PORT_GROUPS"
                                " while TPGS_EXPLICT_ALUA is disabled\n");
-               return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+               rc = PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+               goto out;
        }
 
+       ptr = &buf[4]; /* Skip over RESERVED area in header */
+
        while (len < cmd->data_length) {
                alua_access_state = (ptr[0] & 0x0f);
                /*
@@ -201,7 +221,8 @@ int core_emulate_set_target_port_groups(struct se_cmd *cmd)
                         * REQUEST, and the additional sense code set to INVALID
                         * FIELD IN PARAMETER LIST.
                         */
-                       return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                       rc = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                       goto out;
                }
                rc = -1;
                /*
@@ -224,11 +245,11 @@ int core_emulate_set_target_port_groups(struct se_cmd *cmd)
                         * Locate the matching target port group ID from
                         * the global tg_pt_gp list
                         */
-                       spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                       spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
                        list_for_each_entry(tg_pt_gp,
-                                       &T10_ALUA(su_dev)->tg_pt_gps_list,
+                                       &su_dev->t10_alua.tg_pt_gps_list,
                                        tg_pt_gp_list) {
-                               if (!(tg_pt_gp->tg_pt_gp_valid_id))
+                               if (!tg_pt_gp->tg_pt_gp_valid_id)
                                        continue;
 
                                if (tg_pt_id != tg_pt_gp->tg_pt_gp_id)
@@ -236,24 +257,26 @@ int core_emulate_set_target_port_groups(struct se_cmd *cmd)
 
                                atomic_inc(&tg_pt_gp->tg_pt_gp_ref_cnt);
                                smp_mb__after_atomic_inc();
-                               spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                               spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
 
                                rc = core_alua_do_port_transition(tg_pt_gp,
                                                dev, l_port, nacl,
                                                alua_access_state, 1);
 
-                               spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                               spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
                                atomic_dec(&tg_pt_gp->tg_pt_gp_ref_cnt);
                                smp_mb__after_atomic_dec();
                                break;
                        }
-                       spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                       spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
                        /*
                         * If not matching target port group ID can be located
                         * throw an exception with ASCQ: INVALID_PARAMETER_LIST
                         */
-                       if (rc != 0)
-                               return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                       if (rc != 0) {
+                               rc = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                               goto out;
+                       }
                } else {
                        /*
                         * Extact the RELATIVE TARGET PORT IDENTIFIER to identify
@@ -287,14 +310,19 @@ int core_emulate_set_target_port_groups(struct se_cmd *cmd)
                         * be located, throw an exception with ASCQ:
                         * INVALID_PARAMETER_LIST
                         */
-                       if (rc != 0)
-                               return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                       if (rc != 0) {
+                               rc = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                               goto out;
+                       }
                }
 
                ptr += 4;
                len += 4;
        }
 
+out:
+       transport_kunmap_first_data_page(cmd);
+
        return 0;
 }
 
@@ -464,13 +492,13 @@ static int core_alua_state_check(
        unsigned char *cdb,
        u8 *alua_ascq)
 {
-       struct se_lun *lun = SE_LUN(cmd);
+       struct se_lun *lun = cmd->se_lun;
        struct se_port *port = lun->lun_sep;
        struct t10_alua_tg_pt_gp *tg_pt_gp;
        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
        int out_alua_state, nonop_delay_msecs;
 
-       if (!(port))
+       if (!port)
                return 0;
        /*
         * First, check for a struct se_port specific secondary ALUA target port
@@ -478,7 +506,7 @@ static int core_alua_state_check(
         */
        if (atomic_read(&port->sep_tg_pt_secondary_offline)) {
                *alua_ascq = ASCQ_04H_ALUA_OFFLINE;
-               printk(KERN_INFO "ALUA: Got secondary offline status for local"
+               pr_debug("ALUA: Got secondary offline status for local"
                                " target port\n");
                *alua_ascq = ASCQ_04H_ALUA_OFFLINE;
                return 1;
@@ -520,9 +548,9 @@ static int core_alua_state_check(
         */
        case ALUA_ACCESS_STATE_OFFLINE:
        default:
-               printk(KERN_ERR "Unknown ALUA access state: 0x%02x\n",
+               pr_err("Unknown ALUA access state: 0x%02x\n",
                                out_alua_state);
-               return -1;
+               return -EINVAL;
        }
 
        return 0;
@@ -552,8 +580,8 @@ static int core_alua_check_transition(int state, int *primary)
                *primary = 0;
                break;
        default:
-               printk(KERN_ERR "Unknown ALUA access state: 0x%02x\n", state);
-               return -1;
+               pr_err("Unknown ALUA access state: 0x%02x\n", state);
+               return -EINVAL;
        }
 
        return 0;
@@ -610,7 +638,7 @@ int core_alua_check_nonop_delay(
         * The ALUA Active/NonOptimized access state delay can be disabled
         * in via configfs with a value of zero
         */
-       if (!(cmd->alua_nonop_delay))
+       if (!cmd->alua_nonop_delay)
                return 0;
        /*
         * struct se_cmd->alua_nonop_delay gets set by a target port group
@@ -639,7 +667,7 @@ static int core_alua_write_tpg_metadata(
 
        file = filp_open(path, flags, 0600);
        if (IS_ERR(file) || !file || !file->f_dentry) {
-               printk(KERN_ERR "filp_open(%s) for ALUA metadata failed\n",
+               pr_err("filp_open(%s) for ALUA metadata failed\n",
                        path);
                return -ENODEV;
        }
@@ -653,7 +681,7 @@ static int core_alua_write_tpg_metadata(
        set_fs(old_fs);
 
        if (ret < 0) {
-               printk(KERN_ERR "Error writing ALUA metadata file: %s\n", path);
+               pr_err("Error writing ALUA metadata file: %s\n", path);
                filp_close(file, NULL);
                return -EIO;
        }
@@ -750,7 +778,7 @@ static int core_alua_do_transition_tg_pt(
                         * se_deve->se_lun_acl pointer may be NULL for a
                         * entry created without explict Node+MappedLUN ACLs
                         */
-                       if (!(lacl))
+                       if (!lacl)
                                continue;
 
                        if (explict &&
@@ -792,7 +820,7 @@ static int core_alua_do_transition_tg_pt(
         */
        atomic_set(&tg_pt_gp->tg_pt_gp_alua_access_state, new_state);
 
-       printk(KERN_INFO "Successful %s ALUA transition TG PT Group: %s ID: %hu"
+       pr_debug("Successful %s ALUA transition TG PT Group: %s ID: %hu"
                " from primary access state %s to %s\n", (explict) ? "explict" :
                "implict", config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item),
                tg_pt_gp->tg_pt_gp_id, core_alua_dump_state(old_state),
@@ -823,8 +851,8 @@ int core_alua_do_port_transition(
                return -EINVAL;
 
        md_buf = kzalloc(l_tg_pt_gp->tg_pt_gp_md_buf_len, GFP_KERNEL);
-       if (!(md_buf)) {
-               printk("Unable to allocate buf for ALUA metadata\n");
+       if (!md_buf) {
+               pr_err("Unable to allocate buf for ALUA metadata\n");
                return -ENOMEM;
        }
 
@@ -839,7 +867,7 @@ int core_alua_do_port_transition(
         * we only do transition on the passed *l_tp_pt_gp, and not
         * on all of the matching target port groups IDs in default_lu_gp.
         */
-       if (!(lu_gp->lu_gp_id)) {
+       if (!lu_gp->lu_gp_id) {
                /*
                 * core_alua_do_transition_tg_pt() will always return
                 * success.
@@ -866,12 +894,12 @@ int core_alua_do_port_transition(
                smp_mb__after_atomic_inc();
                spin_unlock(&lu_gp->lu_gp_lock);
 
-               spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+               spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
                list_for_each_entry(tg_pt_gp,
-                               &T10_ALUA(su_dev)->tg_pt_gps_list,
+                               &su_dev->t10_alua.tg_pt_gps_list,
                                tg_pt_gp_list) {
 
-                       if (!(tg_pt_gp->tg_pt_gp_valid_id))
+                       if (!tg_pt_gp->tg_pt_gp_valid_id)
                                continue;
                        /*
                         * If the target behavior port asymmetric access state
@@ -893,7 +921,7 @@ int core_alua_do_port_transition(
                        }
                        atomic_inc(&tg_pt_gp->tg_pt_gp_ref_cnt);
                        smp_mb__after_atomic_inc();
-                       spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                       spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
                        /*
                         * core_alua_do_transition_tg_pt() will always return
                         * success.
@@ -901,11 +929,11 @@ int core_alua_do_port_transition(
                        core_alua_do_transition_tg_pt(tg_pt_gp, port,
                                        nacl, md_buf, new_state, explict);
 
-                       spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                       spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
                        atomic_dec(&tg_pt_gp->tg_pt_gp_ref_cnt);
                        smp_mb__after_atomic_dec();
                }
-               spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+               spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
 
                spin_lock(&lu_gp->lu_gp_lock);
                atomic_dec(&lu_gp_mem->lu_gp_mem_ref_cnt);
@@ -913,7 +941,7 @@ int core_alua_do_port_transition(
        }
        spin_unlock(&lu_gp->lu_gp_lock);
 
-       printk(KERN_INFO "Successfully processed LU Group: %s all ALUA TG PT"
+       pr_debug("Successfully processed LU Group: %s all ALUA TG PT"
                " Group IDs: %hu %s transition to primary state: %s\n",
                config_item_name(&lu_gp->lu_gp_group.cg_item),
                l_tg_pt_gp->tg_pt_gp_id, (explict) ? "explict" : "implict",
@@ -942,11 +970,11 @@ static int core_alua_update_tpg_secondary_metadata(
        memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
 
        len = snprintf(wwn, ALUA_SECONDARY_METADATA_WWN_LEN, "%s",
-                       TPG_TFO(se_tpg)->tpg_get_wwn(se_tpg));
+                       se_tpg->se_tpg_tfo->tpg_get_wwn(se_tpg));
 
-       if (TPG_TFO(se_tpg)->tpg_get_tag != NULL)
+       if (se_tpg->se_tpg_tfo->tpg_get_tag != NULL)
                snprintf(wwn+len, ALUA_SECONDARY_METADATA_WWN_LEN-len, "+%hu",
-                               TPG_TFO(se_tpg)->tpg_get_tag(se_tpg));
+                               se_tpg->se_tpg_tfo->tpg_get_tag(se_tpg));
 
        len = snprintf(md_buf, md_buf_len, "alua_tg_pt_offline=%d\n"
                        "alua_tg_pt_status=0x%02x\n",
@@ -954,7 +982,7 @@ static int core_alua_update_tpg_secondary_metadata(
                        port->sep_tg_pt_secondary_stat);
 
        snprintf(path, ALUA_METADATA_PATH_LEN, "/var/target/alua/%s/%s/lun_%u",
-                       TPG_TFO(se_tpg)->get_fabric_name(), wwn,
+                       se_tpg->se_tpg_tfo->get_fabric_name(), wwn,
                        port->sep_lun->unpacked_lun);
 
        return core_alua_write_tpg_metadata(path, md_buf, len);
@@ -973,11 +1001,11 @@ static int core_alua_set_tg_pt_secondary_state(
 
        spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
        tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
-       if (!(tg_pt_gp)) {
+       if (!tg_pt_gp) {
                spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
-               printk(KERN_ERR "Unable to complete secondary state"
+               pr_err("Unable to complete secondary state"
                                " transition\n");
-               return -1;
+               return -EINVAL;
        }
        trans_delay_msecs = tg_pt_gp->tg_pt_gp_trans_delay_msecs;
        /*
@@ -994,7 +1022,7 @@ static int core_alua_set_tg_pt_secondary_state(
                        ALUA_STATUS_ALTERED_BY_EXPLICT_STPG :
                        ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA;
 
-       printk(KERN_INFO "Successful %s ALUA transition TG PT Group: %s ID: %hu"
+       pr_debug("Successful %s ALUA transition TG PT Group: %s ID: %hu"
                " to secondary access state: %s\n", (explict) ? "explict" :
                "implict", config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item),
                tg_pt_gp->tg_pt_gp_id, (offline) ? "OFFLINE" : "ONLINE");
@@ -1012,10 +1040,10 @@ static int core_alua_set_tg_pt_secondary_state(
         */
        if (port->sep_tg_pt_secondary_write_md) {
                md_buf = kzalloc(md_buf_len, GFP_KERNEL);
-               if (!(md_buf)) {
-                       printk(KERN_ERR "Unable to allocate md_buf for"
+               if (!md_buf) {
+                       pr_err("Unable to allocate md_buf for"
                                " secondary ALUA access metadata\n");
-                       return -1;
+                       return -ENOMEM;
                }
                mutex_lock(&port->sep_tg_pt_md_mutex);
                core_alua_update_tpg_secondary_metadata(tg_pt_gp_mem, port,
@@ -1034,19 +1062,19 @@ core_alua_allocate_lu_gp(const char *name, int def_group)
        struct t10_alua_lu_gp *lu_gp;
 
        lu_gp = kmem_cache_zalloc(t10_alua_lu_gp_cache, GFP_KERNEL);
-       if (!(lu_gp)) {
-               printk(KERN_ERR "Unable to allocate struct t10_alua_lu_gp\n");
+       if (!lu_gp) {
+               pr_err("Unable to allocate struct t10_alua_lu_gp\n");
                return ERR_PTR(-ENOMEM);
        }
-       INIT_LIST_HEAD(&lu_gp->lu_gp_list);
+       INIT_LIST_HEAD(&lu_gp->lu_gp_node);
        INIT_LIST_HEAD(&lu_gp->lu_gp_mem_list);
        spin_lock_init(&lu_gp->lu_gp_lock);
        atomic_set(&lu_gp->lu_gp_ref_cnt, 0);
 
        if (def_group) {
-               lu_gp->lu_gp_id = se_global->alua_lu_gps_counter++;
+               lu_gp->lu_gp_id = alua_lu_gps_counter++;
                lu_gp->lu_gp_valid_id = 1;
-               se_global->alua_lu_gps_count++;
+               alua_lu_gps_count++;
        }
 
        return lu_gp;
@@ -1060,41 +1088,41 @@ int core_alua_set_lu_gp_id(struct t10_alua_lu_gp *lu_gp, u16 lu_gp_id)
         * The lu_gp->lu_gp_id may only be set once..
         */
        if (lu_gp->lu_gp_valid_id) {
-               printk(KERN_WARNING "ALUA LU Group already has a valid ID,"
+               pr_warn("ALUA LU Group already has a valid ID,"
                        " ignoring request\n");
-               return -1;
+               return -EINVAL;
        }
 
-       spin_lock(&se_global->lu_gps_lock);
-       if (se_global->alua_lu_gps_count == 0x0000ffff) {
-               printk(KERN_ERR "Maximum ALUA se_global->alua_lu_gps_count:"
+       spin_lock(&lu_gps_lock);
+       if (alua_lu_gps_count == 0x0000ffff) {
+               pr_err("Maximum ALUA alua_lu_gps_count:"
                                " 0x0000ffff reached\n");
-               spin_unlock(&se_global->lu_gps_lock);
+               spin_unlock(&lu_gps_lock);
                kmem_cache_free(t10_alua_lu_gp_cache, lu_gp);
-               return -1;
+               return -ENOSPC;
        }
 again:
        lu_gp_id_tmp = (lu_gp_id != 0) ? lu_gp_id :
-                               se_global->alua_lu_gps_counter++;
+                               alua_lu_gps_counter++;
 
-       list_for_each_entry(lu_gp_tmp, &se_global->g_lu_gps_list, lu_gp_list) {
+       list_for_each_entry(lu_gp_tmp, &lu_gps_list, lu_gp_node) {
                if (lu_gp_tmp->lu_gp_id == lu_gp_id_tmp) {
-                       if (!(lu_gp_id))
+                       if (!lu_gp_id)
                                goto again;
 
-                       printk(KERN_WARNING "ALUA Logical Unit Group ID: %hu"
+                       pr_warn("ALUA Logical Unit Group ID: %hu"
                                " already exists, ignoring request\n",
                                lu_gp_id);
-                       spin_unlock(&se_global->lu_gps_lock);
-                       return -1;
+                       spin_unlock(&lu_gps_lock);
+                       return -EINVAL;
                }
        }
 
        lu_gp->lu_gp_id = lu_gp_id_tmp;
        lu_gp->lu_gp_valid_id = 1;
-       list_add_tail(&lu_gp->lu_gp_list, &se_global->g_lu_gps_list);
-       se_global->alua_lu_gps_count++;
-       spin_unlock(&se_global->lu_gps_lock);
+       list_add_tail(&lu_gp->lu_gp_node, &lu_gps_list);
+       alua_lu_gps_count++;
+       spin_unlock(&lu_gps_lock);
 
        return 0;
 }
@@ -1105,8 +1133,8 @@ core_alua_allocate_lu_gp_mem(struct se_device *dev)
        struct t10_alua_lu_gp_member *lu_gp_mem;
 
        lu_gp_mem = kmem_cache_zalloc(t10_alua_lu_gp_mem_cache, GFP_KERNEL);
-       if (!(lu_gp_mem)) {
-               printk(KERN_ERR "Unable to allocate struct t10_alua_lu_gp_member\n");
+       if (!lu_gp_mem) {
+               pr_err("Unable to allocate struct t10_alua_lu_gp_member\n");
                return ERR_PTR(-ENOMEM);
        }
        INIT_LIST_HEAD(&lu_gp_mem->lu_gp_mem_list);
@@ -1130,11 +1158,11 @@ void core_alua_free_lu_gp(struct t10_alua_lu_gp *lu_gp)
         * no associations can be made while we are releasing
         * struct t10_alua_lu_gp.
         */
-       spin_lock(&se_global->lu_gps_lock);
+       spin_lock(&lu_gps_lock);
        atomic_set(&lu_gp->lu_gp_shutdown, 1);
-       list_del(&lu_gp->lu_gp_list);
-       se_global->alua_lu_gps_count--;
-       spin_unlock(&se_global->lu_gps_lock);
+       list_del(&lu_gp->lu_gp_node);
+       alua_lu_gps_count--;
+       spin_unlock(&lu_gps_lock);
        /*
         * Allow struct t10_alua_lu_gp * referenced by core_alua_get_lu_gp_by_name()
         * in target_core_configfs.c:target_core_store_alua_lu_gp() to be
@@ -1165,9 +1193,9 @@ void core_alua_free_lu_gp(struct t10_alua_lu_gp *lu_gp)
                 * we want to re-assocate a given lu_gp_mem with default_lu_gp.
                 */
                spin_lock(&lu_gp_mem->lu_gp_mem_lock);
-               if (lu_gp != se_global->default_lu_gp)
+               if (lu_gp != default_lu_gp)
                        __core_alua_attach_lu_gp_mem(lu_gp_mem,
-                                       se_global->default_lu_gp);
+                                       default_lu_gp);
                else
                        lu_gp_mem->lu_gp = NULL;
                spin_unlock(&lu_gp_mem->lu_gp_mem_lock);
@@ -1182,7 +1210,7 @@ void core_alua_free_lu_gp(struct t10_alua_lu_gp *lu_gp)
 void core_alua_free_lu_gp_mem(struct se_device *dev)
 {
        struct se_subsystem_dev *su_dev = dev->se_sub_dev;
-       struct t10_alua *alua = T10_ALUA(su_dev);
+       struct t10_alua *alua = &su_dev->t10_alua;
        struct t10_alua_lu_gp *lu_gp;
        struct t10_alua_lu_gp_member *lu_gp_mem;
 
@@ -1190,7 +1218,7 @@ void core_alua_free_lu_gp_mem(struct se_device *dev)
                return;
 
        lu_gp_mem = dev->dev_alua_lu_gp_mem;
-       if (!(lu_gp_mem))
+       if (!lu_gp_mem)
                return;
 
        while (atomic_read(&lu_gp_mem->lu_gp_mem_ref_cnt))
@@ -1198,7 +1226,7 @@ void core_alua_free_lu_gp_mem(struct se_device *dev)
 
        spin_lock(&lu_gp_mem->lu_gp_mem_lock);
        lu_gp = lu_gp_mem->lu_gp;
-       if ((lu_gp)) {
+       if (lu_gp) {
                spin_lock(&lu_gp->lu_gp_lock);
                if (lu_gp_mem->lu_gp_assoc) {
                        list_del(&lu_gp_mem->lu_gp_mem_list);
@@ -1218,27 +1246,27 @@ struct t10_alua_lu_gp *core_alua_get_lu_gp_by_name(const char *name)
        struct t10_alua_lu_gp *lu_gp;
        struct config_item *ci;
 
-       spin_lock(&se_global->lu_gps_lock);
-       list_for_each_entry(lu_gp, &se_global->g_lu_gps_list, lu_gp_list) {
-               if (!(lu_gp->lu_gp_valid_id))
+       spin_lock(&lu_gps_lock);
+       list_for_each_entry(lu_gp, &lu_gps_list, lu_gp_node) {
+               if (!lu_gp->lu_gp_valid_id)
                        continue;
                ci = &lu_gp->lu_gp_group.cg_item;
-               if (!(strcmp(config_item_name(ci), name))) {
+               if (!strcmp(config_item_name(ci), name)) {
                        atomic_inc(&lu_gp->lu_gp_ref_cnt);
-                       spin_unlock(&se_global->lu_gps_lock);
+                       spin_unlock(&lu_gps_lock);
                        return lu_gp;
                }
        }
-       spin_unlock(&se_global->lu_gps_lock);
+       spin_unlock(&lu_gps_lock);
 
        return NULL;
 }
 
 void core_alua_put_lu_gp_from_name(struct t10_alua_lu_gp *lu_gp)
 {
-       spin_lock(&se_global->lu_gps_lock);
+       spin_lock(&lu_gps_lock);
        atomic_dec(&lu_gp->lu_gp_ref_cnt);
-       spin_unlock(&se_global->lu_gps_lock);
+       spin_unlock(&lu_gps_lock);
 }
 
 /*
@@ -1279,8 +1307,8 @@ struct t10_alua_tg_pt_gp *core_alua_allocate_tg_pt_gp(
        struct t10_alua_tg_pt_gp *tg_pt_gp;
 
        tg_pt_gp = kmem_cache_zalloc(t10_alua_tg_pt_gp_cache, GFP_KERNEL);
-       if (!(tg_pt_gp)) {
-               printk(KERN_ERR "Unable to allocate struct t10_alua_tg_pt_gp\n");
+       if (!tg_pt_gp) {
+               pr_err("Unable to allocate struct t10_alua_tg_pt_gp\n");
                return NULL;
        }
        INIT_LIST_HEAD(&tg_pt_gp->tg_pt_gp_list);
@@ -1304,14 +1332,14 @@ struct t10_alua_tg_pt_gp *core_alua_allocate_tg_pt_gp(
        tg_pt_gp->tg_pt_gp_trans_delay_msecs = ALUA_DEFAULT_TRANS_DELAY_MSECS;
 
        if (def_group) {
-               spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+               spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
                tg_pt_gp->tg_pt_gp_id =
-                               T10_ALUA(su_dev)->alua_tg_pt_gps_counter++;
+                               su_dev->t10_alua.alua_tg_pt_gps_counter++;
                tg_pt_gp->tg_pt_gp_valid_id = 1;
-               T10_ALUA(su_dev)->alua_tg_pt_gps_count++;
+               su_dev->t10_alua.alua_tg_pt_gps_count++;
                list_add_tail(&tg_pt_gp->tg_pt_gp_list,
-                             &T10_ALUA(su_dev)->tg_pt_gps_list);
-               spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                             &su_dev->t10_alua.tg_pt_gps_list);
+               spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
        }
 
        return tg_pt_gp;
@@ -1328,42 +1356,42 @@ int core_alua_set_tg_pt_gp_id(
         * The tg_pt_gp->tg_pt_gp_id may only be set once..
         */
        if (tg_pt_gp->tg_pt_gp_valid_id) {
-               printk(KERN_WARNING "ALUA TG PT Group already has a valid ID,"
+               pr_warn("ALUA TG PT Group already has a valid ID,"
                        " ignoring request\n");
-               return -1;
+               return -EINVAL;
        }
 
-       spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
-       if (T10_ALUA(su_dev)->alua_tg_pt_gps_count == 0x0000ffff) {
-               printk(KERN_ERR "Maximum ALUA alua_tg_pt_gps_count:"
+       spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
+       if (su_dev->t10_alua.alua_tg_pt_gps_count == 0x0000ffff) {
+               pr_err("Maximum ALUA alua_tg_pt_gps_count:"
                        " 0x0000ffff reached\n");
-               spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+               spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
                kmem_cache_free(t10_alua_tg_pt_gp_cache, tg_pt_gp);
-               return -1;
+               return -ENOSPC;
        }
 again:
        tg_pt_gp_id_tmp = (tg_pt_gp_id != 0) ? tg_pt_gp_id :
-                       T10_ALUA(su_dev)->alua_tg_pt_gps_counter++;
+                       su_dev->t10_alua.alua_tg_pt_gps_counter++;
 
-       list_for_each_entry(tg_pt_gp_tmp, &T10_ALUA(su_dev)->tg_pt_gps_list,
+       list_for_each_entry(tg_pt_gp_tmp, &su_dev->t10_alua.tg_pt_gps_list,
                        tg_pt_gp_list) {
                if (tg_pt_gp_tmp->tg_pt_gp_id == tg_pt_gp_id_tmp) {
-                       if (!(tg_pt_gp_id))
+                       if (!tg_pt_gp_id)
                                goto again;
 
-                       printk(KERN_ERR "ALUA Target Port Group ID: %hu already"
+                       pr_err("ALUA Target Port Group ID: %hu already"
                                " exists, ignoring request\n", tg_pt_gp_id);
-                       spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
-                       return -1;
+                       spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
+                       return -EINVAL;
                }
        }
 
        tg_pt_gp->tg_pt_gp_id = tg_pt_gp_id_tmp;
        tg_pt_gp->tg_pt_gp_valid_id = 1;
        list_add_tail(&tg_pt_gp->tg_pt_gp_list,
-                       &T10_ALUA(su_dev)->tg_pt_gps_list);
-       T10_ALUA(su_dev)->alua_tg_pt_gps_count++;
-       spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                       &su_dev->t10_alua.tg_pt_gps_list);
+       su_dev->t10_alua.alua_tg_pt_gps_count++;
+       spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
 
        return 0;
 }
@@ -1375,8 +1403,8 @@ struct t10_alua_tg_pt_gp_member *core_alua_allocate_tg_pt_gp_mem(
 
        tg_pt_gp_mem = kmem_cache_zalloc(t10_alua_tg_pt_gp_mem_cache,
                                GFP_KERNEL);
-       if (!(tg_pt_gp_mem)) {
-               printk(KERN_ERR "Unable to allocate struct t10_alua_tg_pt_gp_member\n");
+       if (!tg_pt_gp_mem) {
+               pr_err("Unable to allocate struct t10_alua_tg_pt_gp_member\n");
                return ERR_PTR(-ENOMEM);
        }
        INIT_LIST_HEAD(&tg_pt_gp_mem->tg_pt_gp_mem_list);
@@ -1403,10 +1431,10 @@ void core_alua_free_tg_pt_gp(
         * no assications *OR* explict ALUA via SET_TARGET_PORT_GROUPS
         * can be made while we are releasing struct t10_alua_tg_pt_gp.
         */
-       spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+       spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
        list_del(&tg_pt_gp->tg_pt_gp_list);
-       T10_ALUA(su_dev)->alua_tg_pt_gps_counter--;
-       spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+       su_dev->t10_alua.alua_tg_pt_gps_counter--;
+       spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
        /*
         * Allow a struct t10_alua_tg_pt_gp_member * referenced by
         * core_alua_get_tg_pt_gp_by_name() in
@@ -1438,9 +1466,9 @@ void core_alua_free_tg_pt_gp(
                 * default_tg_pt_gp.
                 */
                spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
-               if (tg_pt_gp != T10_ALUA(su_dev)->default_tg_pt_gp) {
+               if (tg_pt_gp != su_dev->t10_alua.default_tg_pt_gp) {
                        __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);
                } else
                        tg_pt_gp_mem->tg_pt_gp = NULL;
                spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
@@ -1455,7 +1483,7 @@ void core_alua_free_tg_pt_gp(
 void core_alua_free_tg_pt_gp_mem(struct se_port *port)
 {
        struct se_subsystem_dev *su_dev = port->sep_lun->lun_se_dev->se_sub_dev;
-       struct t10_alua *alua = T10_ALUA(su_dev);
+       struct t10_alua *alua = &su_dev->t10_alua;
        struct t10_alua_tg_pt_gp *tg_pt_gp;
        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
 
@@ -1463,7 +1491,7 @@ void core_alua_free_tg_pt_gp_mem(struct se_port *port)
                return;
 
        tg_pt_gp_mem = port->sep_alua_tg_pt_gp_mem;
-       if (!(tg_pt_gp_mem))
+       if (!tg_pt_gp_mem)
                return;
 
        while (atomic_read(&tg_pt_gp_mem->tg_pt_gp_mem_ref_cnt))
@@ -1471,7 +1499,7 @@ void core_alua_free_tg_pt_gp_mem(struct se_port *port)
 
        spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
        tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
-       if ((tg_pt_gp)) {
+       if (tg_pt_gp) {
                spin_lock(&tg_pt_gp->tg_pt_gp_lock);
                if (tg_pt_gp_mem->tg_pt_gp_assoc) {
                        list_del(&tg_pt_gp_mem->tg_pt_gp_mem_list);
@@ -1493,19 +1521,19 @@ static struct t10_alua_tg_pt_gp *core_alua_get_tg_pt_gp_by_name(
        struct t10_alua_tg_pt_gp *tg_pt_gp;
        struct config_item *ci;
 
-       spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
-       list_for_each_entry(tg_pt_gp, &T10_ALUA(su_dev)->tg_pt_gps_list,
+       spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
+       list_for_each_entry(tg_pt_gp, &su_dev->t10_alua.tg_pt_gps_list,
                        tg_pt_gp_list) {
-               if (!(tg_pt_gp->tg_pt_gp_valid_id))
+               if (!tg_pt_gp->tg_pt_gp_valid_id)
                        continue;
                ci = &tg_pt_gp->tg_pt_gp_group.cg_item;
-               if (!(strcmp(config_item_name(ci), name))) {
+               if (!strcmp(config_item_name(ci), name)) {
                        atomic_inc(&tg_pt_gp->tg_pt_gp_ref_cnt);
-                       spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                       spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
                        return tg_pt_gp;
                }
        }
-       spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+       spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
 
        return NULL;
 }
@@ -1515,9 +1543,9 @@ static void core_alua_put_tg_pt_gp_from_name(
 {
        struct se_subsystem_dev *su_dev = tg_pt_gp->tg_pt_gp_su_dev;
 
-       spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+       spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
        atomic_dec(&tg_pt_gp->tg_pt_gp_ref_cnt);
-       spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+       spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
 }
 
 /*
@@ -1555,7 +1583,7 @@ ssize_t core_alua_show_tg_pt_gp_info(struct se_port *port, char *page)
 {
        struct se_subsystem_dev *su_dev = port->sep_lun->lun_se_dev->se_sub_dev;
        struct config_item *tg_pt_ci;
-       struct t10_alua *alua = T10_ALUA(su_dev);
+       struct t10_alua *alua = &su_dev->t10_alua;
        struct t10_alua_tg_pt_gp *tg_pt_gp;
        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
        ssize_t len = 0;
@@ -1564,12 +1592,12 @@ ssize_t core_alua_show_tg_pt_gp_info(struct se_port *port, char *page)
                return len;
 
        tg_pt_gp_mem = port->sep_alua_tg_pt_gp_mem;
-       if (!(tg_pt_gp_mem))
+       if (!tg_pt_gp_mem)
                return len;
 
        spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
        tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
-       if ((tg_pt_gp)) {
+       if (tg_pt_gp) {
                tg_pt_ci = &tg_pt_gp->tg_pt_gp_group.cg_item;
                len += sprintf(page, "TG Port Alias: %s\nTG Port Group ID:"
                        " %hu\nTG Port Primary Access State: %s\nTG Port "
@@ -1605,16 +1633,16 @@ ssize_t core_alua_store_tg_pt_gp_info(
        tpg = port->sep_tpg;
        lun = port->sep_lun;
 
-       if (T10_ALUA(su_dev)->alua_type != SPC3_ALUA_EMULATED) {
-               printk(KERN_WARNING "SPC3_ALUA_EMULATED not enabled for"
-                       " %s/tpgt_%hu/%s\n", TPG_TFO(tpg)->tpg_get_wwn(tpg),
-                       TPG_TFO(tpg)->tpg_get_tag(tpg),
+       if (su_dev->t10_alua.alua_type != SPC3_ALUA_EMULATED) {
+               pr_warn("SPC3_ALUA_EMULATED not enabled for"
+                       " %s/tpgt_%hu/%s\n", tpg->se_tpg_tfo->tpg_get_wwn(tpg),
+                       tpg->se_tpg_tfo->tpg_get_tag(tpg),
                        config_item_name(&lun->lun_group.cg_item));
                return -EINVAL;
        }
 
        if (count > TG_PT_GROUP_NAME_BUF) {
-               printk(KERN_ERR "ALUA Target Port Group alias too large!\n");
+               pr_err("ALUA Target Port Group alias too large!\n");
                return -EINVAL;
        }
        memset(buf, 0, TG_PT_GROUP_NAME_BUF);
@@ -1631,31 +1659,31 @@ ssize_t core_alua_store_tg_pt_gp_info(
                 */
                tg_pt_gp_new = core_alua_get_tg_pt_gp_by_name(su_dev,
                                        strstrip(buf));
-               if (!(tg_pt_gp_new))
+               if (!tg_pt_gp_new)
                        return -ENODEV;
        }
        tg_pt_gp_mem = port->sep_alua_tg_pt_gp_mem;
-       if (!(tg_pt_gp_mem)) {
+       if (!tg_pt_gp_mem) {
                if (tg_pt_gp_new)
                        core_alua_put_tg_pt_gp_from_name(tg_pt_gp_new);
-               printk(KERN_ERR "NULL struct se_port->sep_alua_tg_pt_gp_mem pointer\n");
+               pr_err("NULL struct se_port->sep_alua_tg_pt_gp_mem pointer\n");
                return -EINVAL;
        }
 
        spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
        tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
-       if ((tg_pt_gp)) {
+       if (tg_pt_gp) {
                /*
                 * Clearing an existing tg_pt_gp association, and replacing
                 * with the default_tg_pt_gp.
                 */
-               if (!(tg_pt_gp_new)) {
-                       printk(KERN_INFO "Target_Core_ConfigFS: Moving"
+               if (!tg_pt_gp_new) {
+                       pr_debug("Target_Core_ConfigFS: Moving"
                                " %s/tpgt_%hu/%s from ALUA Target Port Group:"
                                " alua/%s, ID: %hu back to"
                                " default_tg_pt_gp\n",
-                               TPG_TFO(tpg)->tpg_get_wwn(tpg),
-                               TPG_TFO(tpg)->tpg_get_tag(tpg),
+                               tpg->se_tpg_tfo->tpg_get_wwn(tpg),
+                               tpg->se_tpg_tfo->tpg_get_tag(tpg),
                                config_item_name(&lun->lun_group.cg_item),
                                config_item_name(
                                        &tg_pt_gp->tg_pt_gp_group.cg_item),
@@ -1663,7 +1691,7 @@ ssize_t core_alua_store_tg_pt_gp_info(
 
                        __core_alua_drop_tg_pt_gp_mem(tg_pt_gp_mem, tg_pt_gp);
                        __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);
 
                        return count;
@@ -1679,10 +1707,10 @@ ssize_t core_alua_store_tg_pt_gp_info(
         */
        __core_alua_attach_tg_pt_gp_mem(tg_pt_gp_mem, tg_pt_gp_new);
        spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
-       printk(KERN_INFO "Target_Core_ConfigFS: %s %s/tpgt_%hu/%s to ALUA"
+       pr_debug("Target_Core_ConfigFS: %s %s/tpgt_%hu/%s to ALUA"
                " Target Port Group: alua/%s, ID: %hu\n", (move) ?
-               "Moving" : "Adding", TPG_TFO(tpg)->tpg_get_wwn(tpg),
-               TPG_TFO(tpg)->tpg_get_tag(tpg),
+               "Moving" : "Adding", tpg->se_tpg_tfo->tpg_get_wwn(tpg),
+               tpg->se_tpg_tfo->tpg_get_tag(tpg),
                config_item_name(&lun->lun_group.cg_item),
                config_item_name(&tg_pt_gp_new->tg_pt_gp_group.cg_item),
                tg_pt_gp_new->tg_pt_gp_id);
@@ -1716,11 +1744,11 @@ ssize_t core_alua_store_access_type(
 
        ret = strict_strtoul(page, 0, &tmp);
        if (ret < 0) {
-               printk(KERN_ERR "Unable to extract alua_access_type\n");
+               pr_err("Unable to extract alua_access_type\n");
                return -EINVAL;
        }
        if ((tmp != 0) && (tmp != 1) && (tmp != 2) && (tmp != 3)) {
-               printk(KERN_ERR "Illegal value for alua_access_type:"
+               pr_err("Illegal value for alua_access_type:"
                                " %lu\n", tmp);
                return -EINVAL;
        }
@@ -1754,11 +1782,11 @@ ssize_t core_alua_store_nonop_delay_msecs(
 
        ret = strict_strtoul(page, 0, &tmp);
        if (ret < 0) {
-               printk(KERN_ERR "Unable to extract nonop_delay_msecs\n");
+               pr_err("Unable to extract nonop_delay_msecs\n");
                return -EINVAL;
        }
        if (tmp > ALUA_MAX_NONOP_DELAY_MSECS) {
-               printk(KERN_ERR "Passed nonop_delay_msecs: %lu, exceeds"
+               pr_err("Passed nonop_delay_msecs: %lu, exceeds"
                        " ALUA_MAX_NONOP_DELAY_MSECS: %d\n", tmp,
                        ALUA_MAX_NONOP_DELAY_MSECS);
                return -EINVAL;
@@ -1785,11 +1813,11 @@ ssize_t core_alua_store_trans_delay_msecs(
 
        ret = strict_strtoul(page, 0, &tmp);
        if (ret < 0) {
-               printk(KERN_ERR "Unable to extract trans_delay_msecs\n");
+               pr_err("Unable to extract trans_delay_msecs\n");
                return -EINVAL;
        }
        if (tmp > ALUA_MAX_TRANS_DELAY_MSECS) {
-               printk(KERN_ERR "Passed trans_delay_msecs: %lu, exceeds"
+               pr_err("Passed trans_delay_msecs: %lu, exceeds"
                        " ALUA_MAX_TRANS_DELAY_MSECS: %d\n", tmp,
                        ALUA_MAX_TRANS_DELAY_MSECS);
                return -EINVAL;
@@ -1816,11 +1844,11 @@ ssize_t core_alua_store_preferred_bit(
 
        ret = strict_strtoul(page, 0, &tmp);
        if (ret < 0) {
-               printk(KERN_ERR "Unable to extract preferred ALUA value\n");
+               pr_err("Unable to extract preferred ALUA value\n");
                return -EINVAL;
        }
        if ((tmp != 0) && (tmp != 1)) {
-               printk(KERN_ERR "Illegal value for preferred ALUA: %lu\n", tmp);
+               pr_err("Illegal value for preferred ALUA: %lu\n", tmp);
                return -EINVAL;
        }
        tg_pt_gp->tg_pt_gp_pref = (int)tmp;
@@ -1830,7 +1858,7 @@ ssize_t core_alua_store_preferred_bit(
 
 ssize_t core_alua_show_offline_bit(struct se_lun *lun, char *page)
 {
-       if (!(lun->lun_sep))
+       if (!lun->lun_sep)
                return -ENODEV;
 
        return sprintf(page, "%d\n",
@@ -1846,22 +1874,22 @@ ssize_t core_alua_store_offline_bit(
        unsigned long tmp;
        int ret;
 
-       if (!(lun->lun_sep))
+       if (!lun->lun_sep)
                return -ENODEV;
 
        ret = strict_strtoul(page, 0, &tmp);
        if (ret < 0) {
-               printk(KERN_ERR "Unable to extract alua_tg_pt_offline value\n");
+               pr_err("Unable to extract alua_tg_pt_offline value\n");
                return -EINVAL;
        }
        if ((tmp != 0) && (tmp != 1)) {
-               printk(KERN_ERR "Illegal value for alua_tg_pt_offline: %lu\n",
+               pr_err("Illegal value for alua_tg_pt_offline: %lu\n",
                                tmp);
                return -EINVAL;
        }
        tg_pt_gp_mem = lun->lun_sep->sep_alua_tg_pt_gp_mem;
-       if (!(tg_pt_gp_mem)) {
-               printk(KERN_ERR "Unable to locate *tg_pt_gp_mem\n");
+       if (!tg_pt_gp_mem) {
+               pr_err("Unable to locate *tg_pt_gp_mem\n");
                return -EINVAL;
        }
 
@@ -1890,13 +1918,13 @@ ssize_t core_alua_store_secondary_status(
 
        ret = strict_strtoul(page, 0, &tmp);
        if (ret < 0) {
-               printk(KERN_ERR "Unable to extract alua_tg_pt_status\n");
+               pr_err("Unable to extract alua_tg_pt_status\n");
                return -EINVAL;
        }
        if ((tmp != ALUA_STATUS_NONE) &&
            (tmp != ALUA_STATUS_ALTERED_BY_EXPLICT_STPG) &&
            (tmp != ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA)) {
-               printk(KERN_ERR "Illegal value for alua_tg_pt_status: %lu\n",
+               pr_err("Illegal value for alua_tg_pt_status: %lu\n",
                                tmp);
                return -EINVAL;
        }
@@ -1923,11 +1951,11 @@ ssize_t core_alua_store_secondary_write_metadata(
 
        ret = strict_strtoul(page, 0, &tmp);
        if (ret < 0) {
-               printk(KERN_ERR "Unable to extract alua_tg_pt_write_md\n");
+               pr_err("Unable to extract alua_tg_pt_write_md\n");
                return -EINVAL;
        }
        if ((tmp != 0) && (tmp != 1)) {
-               printk(KERN_ERR "Illegal value for alua_tg_pt_write_md:"
+               pr_err("Illegal value for alua_tg_pt_write_md:"
                                " %lu\n", tmp);
                return -EINVAL;
        }
@@ -1939,7 +1967,7 @@ ssize_t core_alua_store_secondary_write_metadata(
 int core_setup_alua(struct se_device *dev, int force_pt)
 {
        struct se_subsystem_dev *su_dev = dev->se_sub_dev;
-       struct t10_alua *alua = T10_ALUA(su_dev);
+       struct t10_alua *alua = &su_dev->t10_alua;
        struct t10_alua_lu_gp_member *lu_gp_mem;
        /*
         * If this device is from Target_Core_Mod/pSCSI, use the ALUA logic
@@ -1947,44 +1975,44 @@ int core_setup_alua(struct se_device *dev, int force_pt)
         * cause a problem because libata and some SATA RAID HBAs appear
         * under Linux/SCSI, but emulate SCSI logic themselves.
         */
-       if (((TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) &&
-           !(DEV_ATTRIB(dev)->emulate_alua)) || force_pt) {
+       if (((dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) &&
+           !(dev->se_sub_dev->se_dev_attrib.emulate_alua)) || force_pt) {
                alua->alua_type = SPC_ALUA_PASSTHROUGH;
                alua->alua_state_check = &core_alua_state_check_nop;
-               printk(KERN_INFO "%s: Using SPC_ALUA_PASSTHROUGH, no ALUA"
-                       " emulation\n", TRANSPORT(dev)->name);
+               pr_debug("%s: Using SPC_ALUA_PASSTHROUGH, no ALUA"
+                       " emulation\n", dev->transport->name);
                return 0;
        }
        /*
         * If SPC-3 or above is reported by real or emulated struct se_device,
         * use emulated ALUA.
         */
-       if (TRANSPORT(dev)->get_device_rev(dev) >= SCSI_3) {
-               printk(KERN_INFO "%s: Enabling ALUA Emulation for SPC-3"
-                       " device\n", TRANSPORT(dev)->name);
+       if (dev->transport->get_device_rev(dev) >= SCSI_3) {
+               pr_debug("%s: Enabling ALUA Emulation for SPC-3"
+                       " device\n", dev->transport->name);
                /*
                 * Associate this struct se_device with the default ALUA
                 * LUN Group.
                 */
                lu_gp_mem = core_alua_allocate_lu_gp_mem(dev);
-               if (IS_ERR(lu_gp_mem) || !lu_gp_mem)
-                       return -1;
+               if (IS_ERR(lu_gp_mem))
+                       return PTR_ERR(lu_gp_mem);
 
                alua->alua_type = SPC3_ALUA_EMULATED;
                alua->alua_state_check = &core_alua_state_check;
                spin_lock(&lu_gp_mem->lu_gp_mem_lock);
                __core_alua_attach_lu_gp_mem(lu_gp_mem,
-                               se_global->default_lu_gp);
+                               default_lu_gp);
                spin_unlock(&lu_gp_mem->lu_gp_mem_lock);
 
-               printk(KERN_INFO "%s: Adding to default ALUA LU Group:"
+               pr_debug("%s: Adding to default ALUA LU Group:"
                        " core/alua/lu_gps/default_lu_gp\n",
-                       TRANSPORT(dev)->name);
+                       dev->transport->name);
        } else {
                alua->alua_type = SPC2_ALUA_DISABLED;
                alua->alua_state_check = &core_alua_state_check_nop;
-               printk(KERN_INFO "%s: Disabling ALUA Emulation for SPC-2"
-                       " device\n", TRANSPORT(dev)->name);
+               pr_debug("%s: Disabling ALUA Emulation for SPC-2"
+                       " device\n", dev->transport->name);
        }
 
        return 0;