diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/target/target_core_device.c | 3 | ||||
-rw-r--r-- | drivers/target/target_core_fabric_configfs.c | 3 | ||||
-rw-r--r-- | drivers/target/target_core_internal.h | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c index bcef6771bafc..415c71ecdff0 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c | |||
@@ -1273,7 +1273,6 @@ int se_dev_set_block_size(struct se_device *dev, u32 block_size) | |||
1273 | 1273 | ||
1274 | struct se_lun *core_dev_add_lun( | 1274 | struct se_lun *core_dev_add_lun( |
1275 | struct se_portal_group *tpg, | 1275 | struct se_portal_group *tpg, |
1276 | struct se_hba *hba, | ||
1277 | struct se_device *dev, | 1276 | struct se_device *dev, |
1278 | u32 lun) | 1277 | u32 lun) |
1279 | { | 1278 | { |
@@ -1298,7 +1297,7 @@ struct se_lun *core_dev_add_lun( | |||
1298 | pr_debug("%s_TPG[%u]_LUN[%u] - Activated %s Logical Unit from" | 1297 | pr_debug("%s_TPG[%u]_LUN[%u] - Activated %s Logical Unit from" |
1299 | " CORE HBA: %u\n", tpg->se_tpg_tfo->get_fabric_name(), | 1298 | " CORE HBA: %u\n", tpg->se_tpg_tfo->get_fabric_name(), |
1300 | tpg->se_tpg_tfo->tpg_get_tag(tpg), lun_p->unpacked_lun, | 1299 | tpg->se_tpg_tfo->tpg_get_tag(tpg), lun_p->unpacked_lun, |
1301 | tpg->se_tpg_tfo->get_fabric_name(), hba->hba_id); | 1300 | tpg->se_tpg_tfo->get_fabric_name(), dev->se_hba->hba_id); |
1302 | /* | 1301 | /* |
1303 | * Update LUN maps for dynamically added initiators when | 1302 | * Update LUN maps for dynamically added initiators when |
1304 | * generate_node_acl is enabled. | 1303 | * generate_node_acl is enabled. |
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c index 405cc98eaed6..ea479e54f5fd 100644 --- a/drivers/target/target_core_fabric_configfs.c +++ b/drivers/target/target_core_fabric_configfs.c | |||
@@ -764,8 +764,7 @@ static int target_fabric_port_link( | |||
764 | goto out; | 764 | goto out; |
765 | } | 765 | } |
766 | 766 | ||
767 | lun_p = core_dev_add_lun(se_tpg, dev->se_hba, dev, | 767 | lun_p = core_dev_add_lun(se_tpg, dev, lun->unpacked_lun); |
768 | lun->unpacked_lun); | ||
769 | if (IS_ERR(lun_p)) { | 768 | if (IS_ERR(lun_p)) { |
770 | pr_err("core_dev_add_lun() failed\n"); | 769 | pr_err("core_dev_add_lun() failed\n"); |
771 | ret = PTR_ERR(lun_p); | 770 | ret = PTR_ERR(lun_p); |
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h index 88f69e0ba515..d41a9bb89ce1 100644 --- a/drivers/target/target_core_internal.h +++ b/drivers/target/target_core_internal.h | |||
@@ -45,8 +45,7 @@ int se_dev_set_max_sectors(struct se_device *, u32); | |||
45 | int se_dev_set_fabric_max_sectors(struct se_device *, u32); | 45 | int se_dev_set_fabric_max_sectors(struct se_device *, u32); |
46 | int se_dev_set_optimal_sectors(struct se_device *, u32); | 46 | int se_dev_set_optimal_sectors(struct se_device *, u32); |
47 | int se_dev_set_block_size(struct se_device *, u32); | 47 | int se_dev_set_block_size(struct se_device *, u32); |
48 | struct se_lun *core_dev_add_lun(struct se_portal_group *, struct se_hba *, | 48 | struct se_lun *core_dev_add_lun(struct se_portal_group *, struct se_device *, u32); |
49 | struct se_device *, u32); | ||
50 | int core_dev_del_lun(struct se_portal_group *, u32); | 49 | int core_dev_del_lun(struct se_portal_group *, u32); |
51 | struct se_lun *core_get_lun_from_tpg(struct se_portal_group *, u32); | 50 | struct se_lun *core_get_lun_from_tpg(struct se_portal_group *, u32); |
52 | struct se_lun_acl *core_dev_init_initiator_node_lun_acl(struct se_portal_group *, | 51 | struct se_lun_acl *core_dev_init_initiator_node_lun_acl(struct se_portal_group *, |