Merge tag 'for-3.6-rc6' of git://gitorious.org/linux-pwm/linux-pwm

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / target / target_core_stat.c

diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c
index f8c2d2c..3d44beb 100644 (file)
--- a/drivers/target/target_core_stat.c
+++ b/drivers/target/target_core_stat.c
@@ -954,7 +954,6 @@ static ssize_t target_stat_scsi_tgt_port_show_attr_in_cmds(
 {
        struct se_lun *lun = container_of(pgrps, struct se_lun, port_stat_grps);
        struct se_port *sep;
-       struct se_portal_group *tpg;
        ssize_t ret;
 
        spin_lock(&lun->lun_sep_lock);
@@ -963,7 +962,6 @@ static ssize_t target_stat_scsi_tgt_port_show_attr_in_cmds(
                spin_unlock(&lun->lun_sep_lock);
                return -ENODEV;
        }
-       tpg = sep->sep_tpg;
 
        ret = snprintf(page, PAGE_SIZE, "%llu\n", sep->sep_stats.cmd_pdus);
        spin_unlock(&lun->lun_sep_lock);
@@ -976,7 +974,6 @@ static ssize_t target_stat_scsi_tgt_port_show_attr_write_mbytes(
 {
        struct se_lun *lun = container_of(pgrps, struct se_lun, port_stat_grps);
        struct se_port *sep;
-       struct se_portal_group *tpg;
        ssize_t ret;
 
        spin_lock(&lun->lun_sep_lock);
@@ -985,7 +982,6 @@ static ssize_t target_stat_scsi_tgt_port_show_attr_write_mbytes(
                spin_unlock(&lun->lun_sep_lock);
                return -ENODEV;
        }
-       tpg = sep->sep_tpg;
 
        ret = snprintf(page, PAGE_SIZE, "%u\n",
                        (u32)(sep->sep_stats.rx_data_octets >> 20));
@@ -999,7 +995,6 @@ static ssize_t target_stat_scsi_tgt_port_show_attr_read_mbytes(
 {
        struct se_lun *lun = container_of(pgrps, struct se_lun, port_stat_grps);
        struct se_port *sep;
-       struct se_portal_group *tpg;
        ssize_t ret;
 
        spin_lock(&lun->lun_sep_lock);
@@ -1008,7 +1003,6 @@ static ssize_t target_stat_scsi_tgt_port_show_attr_read_mbytes(
                spin_unlock(&lun->lun_sep_lock);
                return -ENODEV;
        }
-       tpg = sep->sep_tpg;
 
        ret = snprintf(page, PAGE_SIZE, "%u\n",
                        (u32)(sep->sep_stats.tx_data_octets >> 20));
@@ -1022,7 +1016,6 @@ static ssize_t target_stat_scsi_tgt_port_show_attr_hs_in_cmds(
 {
        struct se_lun *lun = container_of(pgrps, struct se_lun, port_stat_grps);
        struct se_port *sep;
-       struct se_portal_group *tpg;
        ssize_t ret;
 
        spin_lock(&lun->lun_sep_lock);
@@ -1031,7 +1024,6 @@ static ssize_t target_stat_scsi_tgt_port_show_attr_hs_in_cmds(
                spin_unlock(&lun->lun_sep_lock);
                return -ENODEV;
        }
-       tpg = sep->sep_tpg;
 
        /* FIXME: scsiTgtPortHsInCommands */
        ret = snprintf(page, PAGE_SIZE, "%u\n", 0);
@@ -1253,7 +1245,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_inst(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1275,16 +1267,14 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_dev(
        struct se_node_acl *nacl = lacl->se_lun_nacl;
        struct se_dev_entry *deve;
        struct se_lun *lun;
-       struct se_portal_group *tpg;
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
        }
-       tpg = nacl->se_tpg;
        lun = deve->se_lun;
        /* scsiDeviceIndex */
        ret = snprintf(page, PAGE_SIZE, "%u\n", lun->lun_se_dev->dev_index);
@@ -1304,7 +1294,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_port(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1327,7 +1317,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_indx(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1349,7 +1339,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_dev_or_port(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1371,7 +1361,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_intr_name(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1393,7 +1383,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_map_indx(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1415,7 +1405,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_att_count(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1437,7 +1427,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_num_cmds(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1459,7 +1449,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_read_mbytes(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1481,7 +1471,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_write_mbytes(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1503,7 +1493,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_hs_num_cmds(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1525,7 +1515,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_creation_time(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1548,7 +1538,7 @@ static ssize_t target_stat_scsi_auth_intr_show_attr_row_status(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1621,7 +1611,7 @@ static ssize_t target_stat_scsi_att_intr_port_show_attr_inst(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1643,16 +1633,14 @@ static ssize_t target_stat_scsi_att_intr_port_show_attr_dev(
        struct se_node_acl *nacl = lacl->se_lun_nacl;
        struct se_dev_entry *deve;
        struct se_lun *lun;
-       struct se_portal_group *tpg;
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
        }
-       tpg = nacl->se_tpg;
        lun = deve->se_lun;
        /* scsiDeviceIndex */
        ret = snprintf(page, PAGE_SIZE, "%u\n", lun->lun_se_dev->dev_index);
@@ -1672,7 +1660,7 @@ static ssize_t target_stat_scsi_att_intr_port_show_attr_port(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;
@@ -1721,7 +1709,7 @@ static ssize_t target_stat_scsi_att_intr_port_show_attr_port_auth_indx(
        ssize_t ret;
 
        spin_lock_irq(&nacl->device_list_lock);
-       deve = &nacl->device_list[lacl->mapped_lun];
+       deve = nacl->device_list[lacl->mapped_lun];
        if (!deve->se_lun || !deve->se_lun_acl) {
                spin_unlock_irq(&nacl->device_list_lock);
                return -ENODEV;