On Fri, 2011-05-27 at 12:07 -0700, Andy Grover wrote:
> Instead of in an out parameter. Seems simpler.
>
> Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
> ---
Looks reasonable. Committed as 738f6c071fb7
Thanks,
--nab
> drivers/target/target_core_transport.c | 24 +++++++++---------------
> 1 files changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
> index 8698c5f..621fe63 100644
> --- a/drivers/target/target_core_transport.c
> +++ b/drivers/target/target_core_transport.c
> @@ -216,8 +216,7 @@ static int transport_generic_remove(struct se_cmd *cmd,
> int release_to_pool, int session_reinstatement);
> static int transport_cmd_get_valid_sectors(struct se_cmd *cmd);
> static int transport_map_sg_to_mem(struct se_cmd *cmd,
> - struct list_head *se_mem_list, struct scatterlist *sgl,
> - u32 *se_mem_cnt);
> + struct list_head *se_mem_list, struct scatterlist *sgl);
> static void transport_memcpy_se_mem_read_contig(unsigned char *dst,
> struct list_head *se_mem_list, u32 len);
> static void transport_release_fe_cmd(struct se_cmd *cmd);
> @@ -3914,7 +3913,6 @@ int transport_generic_map_mem_to_cmd(
> struct scatterlist *sgl_bidi,
> u32 sgl_bidi_count)
> {
> - u32 mapped_sg_count = 0;
> int ret;
>
> if (!sgl || !sgl_count)
> @@ -3930,24 +3928,20 @@ int transport_generic_map_mem_to_cmd(
> * processed into a TCM struct se_subsystem_dev, we do the mapping
> * from the passed physical memory to struct se_mem->se_page here.
> */
> - ret = transport_map_sg_to_mem(cmd,
> - &cmd->t_mem_list, sgl, &mapped_sg_count);
> + ret = transport_map_sg_to_mem(cmd, &cmd->t_mem_list, sgl);
> if (ret < 0)
> return -ENOMEM;
>
> - cmd->t_tasks_se_num = mapped_sg_count;
> + cmd->t_tasks_se_num = ret;
> /*
> * Setup BIDI READ list of struct se_mem elements
> */
> if (sgl_bidi && sgl_bidi_count) {
> - mapped_sg_count = 0;
> - ret = transport_map_sg_to_mem(cmd,
> - &cmd->t_mem_bidi_list, sgl_bidi,
> - &mapped_sg_count);
> + ret = transport_map_sg_to_mem(cmd, &cmd->t_mem_bidi_list, sgl_bidi);
> if (ret < 0)
> return -ENOMEM;
>
> - cmd->t_tasks_se_bidi_num = mapped_sg_count;
> + cmd->t_tasks_se_bidi_num = ret;
> }
> cmd->se_cmd_flags |= SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC;
>
> @@ -4214,11 +4208,11 @@ static inline sector_t transport_limit_task_sectors(
> static int transport_map_sg_to_mem(
> struct se_cmd *cmd,
> struct list_head *se_mem_list,
> - struct scatterlist *sg,
> - u32 *sg_count)
> + struct scatterlist *sg)
> {
> struct se_mem *se_mem;
> u32 cmd_size = cmd->data_length;
> + int sg_count = 0;
>
> WARN_ON(!sg);
>
> @@ -4248,7 +4242,7 @@ static int transport_map_sg_to_mem(
> se_mem->se_len = cmd_size;
>
> cmd_size -= se_mem->se_len;
> - (*sg_count)++;
> + sg_count++;
>
> DEBUG_MEM("sg_to_mem: *sg_count: %u cmd_size: %u\n",
> *sg_count, cmd_size);
> @@ -4261,7 +4255,7 @@ static int transport_map_sg_to_mem(
> DEBUG_MEM("task[0] - Mapped(%u) struct scatterlist segments to(%u)"
> " struct se_mem\n", sg_count, *se_mem_cnt);
>
> - return 0;
> + return sg_count;
> }
>
> /* transport_map_mem_to_sg():
> --
> 1.7.1
>
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
