On Fri, 2013-12-13 at 15:59 -0800, Andy Grover wrote:
> Especially since it's actually a device.
>
> Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
> ---
> drivers/target/target_core_internal.h | 2 +-
> drivers/target/target_core_tpg.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
Applied to target-pending/for-next.
--nab
> diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
> index 4093936..aabb730 100644
> --- a/drivers/target/target_core_internal.h
> +++ b/drivers/target/target_core_internal.h
> @@ -89,7 +89,7 @@ void core_tpg_add_node_to_devs(struct se_node_acl *, struct se_portal_group *);
> void core_tpg_wait_for_nacl_pr_ref(struct se_node_acl *);
> struct se_lun *core_tpg_alloc_lun(struct se_portal_group *, u32);
> int core_tpg_add_lun(struct se_portal_group *, struct se_lun *,
> - u32, void *);
> + u32, struct se_device *);
> struct se_lun *core_tpg_pre_dellun(struct se_portal_group *, u32 unpacked_lun);
> int core_tpg_post_dellun(struct se_portal_group *, struct se_lun *);
>
> diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
> index 55a9d38..da7febb 100644
> --- a/drivers/target/target_core_tpg.c
> +++ b/drivers/target/target_core_tpg.c
> @@ -819,7 +819,7 @@ int core_tpg_add_lun(
> struct se_portal_group *tpg,
> struct se_lun *lun,
> u32 lun_access,
> - void *lun_ptr)
> + struct se_device *dev)
> {
> int ret;
>
> @@ -827,7 +827,7 @@ int core_tpg_add_lun(
> if (ret < 0)
> return ret;
>
> - ret = core_dev_export(lun_ptr, tpg, lun);
> + ret = core_dev_export(dev, tpg, lun);
> if (ret < 0) {
> percpu_ref_cancel_init(&lun->lun_ref);
> return ret;
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
