On Thu, 15 Nov 2007 11:53:25 +0200
Boaz Harrosh <bharrosh@xxxxxxxxxxx> wrote:
> From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
>
> Fix scsi_tgt_lib build when dprintk is defined:
> Also fix accessors problem when dprintk is defined
>
> drivers/scsi/scsi_tgt_lib.c: In function 'scsi_tgt_cmd_destroy':
> drivers/scsi/scsi_tgt_lib.c:183: warning: format '%lu' expects type 'long unsigned int', but argument 6 has type 'unsigned int'
> drivers/scsi/scsi_tgt_lib.c: In function 'scsi_tgt_cmd_done':
> drivers/scsi/scsi_tgt_lib.c:330: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'unsigned int'
> drivers/scsi/scsi_tgt_lib.c: In function 'scsi_tgt_transfer_response':
> drivers/scsi/scsi_tgt_lib.c:345: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'unsigned int'
> drivers/scsi/scsi_tgt_lib.c: In function 'scsi_tgt_init_cmd':
> drivers/scsi/scsi_tgt_lib.c:368: warning: format '%lu' expects type 'long unsigned int', but argument 6 has type 'unsigned int'
> drivers/scsi/scsi_tgt_lib.c: In function 'scsi_tgt_kspace_exec':
> drivers/scsi/scsi_tgt_lib.c:499: warning: format '%lu' expects type 'long unsigned int', but argument 9 has type 'unsigned int'
> drivers/scsi/scsi_tgt_lib.c: In function 'scsi_tgt_kspace_it_nexus_rsp':
> drivers/scsi/scsi_tgt_lib.c:620: error: 'mid' undeclared (first use in this function)
> drivers/scsi/scsi_tgt_lib.c:620: error: (Each undeclared identifier is reported only once
> drivers/scsi/scsi_tgt_lib.c:620: error: for each function it appears in.)
> make[2]: *** [drivers/scsi/scsi_tgt_lib.o] Error 1
>
> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
> Signed-off-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
> ---
> drivers/scsi/scsi_tgt_lib.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
> index 5fd5fca..746f1a1 100644
> --- a/drivers/scsi/scsi_tgt_lib.c
> +++ b/drivers/scsi/scsi_tgt_lib.c
> @@ -180,7 +180,7 @@ static void scsi_tgt_cmd_destroy(struct work_struct *work)
> container_of(work, struct scsi_tgt_cmd, work);
> struct scsi_cmnd *cmd = tcmd->rq->special;
>
> - dprintk("cmd %p %d %lu\n", cmd, cmd->sc_data_direction,
> + dprintk("cmd %p %d %u\n", cmd, cmd->sc_data_direction,
> rq_data_dir(cmd->request));
> scsi_unmap_user_pages(tcmd);
> scsi_host_put_command(scsi_tgt_cmd_to_host(cmd), cmd);
> @@ -327,7 +327,7 @@ static void scsi_tgt_cmd_done(struct scsi_cmnd *cmd)
> {
> struct scsi_tgt_cmd *tcmd = cmd->request->end_io_data;
>
> - dprintk("cmd %p %lu\n", cmd, rq_data_dir(cmd->request));
> + dprintk("cmd %p %u\n", cmd, rq_data_dir(cmd->request));
>
> scsi_tgt_uspace_send_status(cmd, tcmd->itn_id, tcmd->tag);
>
> @@ -341,7 +341,7 @@ static int scsi_tgt_transfer_response(struct scsi_cmnd *cmd)
> struct Scsi_Host *shost = scsi_tgt_cmd_to_host(cmd);
> int err;
>
> - dprintk("cmd %p %lu\n", cmd, rq_data_dir(cmd->request));
> + dprintk("cmd %p %u\n", cmd, rq_data_dir(cmd->request));
>
> err = shost->hostt->transfer_response(cmd, scsi_tgt_cmd_done);
> switch (err) {
> @@ -473,8 +473,8 @@ int scsi_tgt_kspace_exec(int host_no, u64 itn_id, int result, u64 tag,
> }
> cmd = rq->special;
>
> - dprintk("cmd %p scb %x result %d len %d bufflen %u %lu %x\n",
> - cmd, cmd->cmnd[0], result, len, cmd->request_bufflen,
> + dprintk("cmd %p scb %x result %d len %d bufflen %u %u %x\n",
> + cmd, cmd->cmnd[0], result, len, scsi_bufflen(cmd),
> rq_data_dir(rq), cmd->cmnd[0]);
>
> if (result == TASK_ABORTED) {
> @@ -594,7 +594,7 @@ int scsi_tgt_kspace_it_nexus_rsp(int host_no, u64 itn_id, int result)
> struct Scsi_Host *shost;
> int err = -EINVAL;
>
> - dprintk("%d %d %llx\n", host_no, result, (unsigned long long) mid);
> + dprintk("%d %d\n", host_no, result);
'mid' is a typo. I wanted to do:
dprintk("%d %d %llx\n", host_no, result, (unsigned long long)itn_id);
The rest looks ok. Thanks,
-
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
