diff options
author | Andy Grover <agrover@redhat.com> | 2013-12-12 19:12:33 -0500 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2013-12-16 16:29:20 -0500 |
commit | 340dbf729c3395cf1317890d033aa9ac7347766c (patch) | |
tree | 6b3bd411dd9f70c83b9d6b096dc3211562bdd8c7 /drivers/target | |
parent | d344f8a15637e8b57a0d05a6d50182c11de08606 (diff) |
target: Don't use void* when passing dev in core_tpg_add_lun
Especially since it's actually a device.
Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r-- | drivers/target/target_core_internal.h | 2 | ||||
-rw-r--r-- | drivers/target/target_core_tpg.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h index f67e764a42bd..1e27614e6bcc 100644 --- a/drivers/target/target_core_internal.h +++ b/drivers/target/target_core_internal.h | |||
@@ -79,7 +79,7 @@ void core_tpg_add_node_to_devs(struct se_node_acl *, struct se_portal_group *); | |||
79 | void core_tpg_wait_for_nacl_pr_ref(struct se_node_acl *); | 79 | void core_tpg_wait_for_nacl_pr_ref(struct se_node_acl *); |
80 | struct se_lun *core_tpg_alloc_lun(struct se_portal_group *, u32); | 80 | struct se_lun *core_tpg_alloc_lun(struct se_portal_group *, u32); |
81 | int core_tpg_add_lun(struct se_portal_group *, struct se_lun *, | 81 | int core_tpg_add_lun(struct se_portal_group *, struct se_lun *, |
82 | u32, void *); | 82 | u32, struct se_device *); |
83 | struct se_lun *core_tpg_pre_dellun(struct se_portal_group *, u32 unpacked_lun); | 83 | struct se_lun *core_tpg_pre_dellun(struct se_portal_group *, u32 unpacked_lun); |
84 | int core_tpg_post_dellun(struct se_portal_group *, struct se_lun *); | 84 | int core_tpg_post_dellun(struct se_portal_group *, struct se_lun *); |
85 | 85 | ||
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c index a1dbc9488183..d1df39a05d88 100644 --- a/drivers/target/target_core_tpg.c +++ b/drivers/target/target_core_tpg.c | |||
@@ -823,7 +823,7 @@ int core_tpg_add_lun( | |||
823 | struct se_portal_group *tpg, | 823 | struct se_portal_group *tpg, |
824 | struct se_lun *lun, | 824 | struct se_lun *lun, |
825 | u32 lun_access, | 825 | u32 lun_access, |
826 | void *lun_ptr) | 826 | struct se_device *dev) |
827 | { | 827 | { |
828 | int ret; | 828 | int ret; |
829 | 829 | ||
@@ -831,7 +831,7 @@ int core_tpg_add_lun( | |||
831 | if (ret < 0) | 831 | if (ret < 0) |
832 | return ret; | 832 | return ret; |
833 | 833 | ||
834 | ret = core_dev_export(lun_ptr, tpg, lun); | 834 | ret = core_dev_export(dev, tpg, lun); |
835 | if (ret < 0) { | 835 | if (ret < 0) { |
836 | percpu_ref_cancel_init(&lun->lun_ref); | 836 | percpu_ref_cancel_init(&lun->lun_ref); |
837 | return ret; | 837 | return ret; |