aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2007-11-15 04:53:25 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-11 19:22:49 -0500
commita8aae4d3427a5cf7c92b50125e35ea6cb9ba7394 (patch)
tree999c063f37e10c984fea1cf602022ab21c46dbe3
parentf3307f7276067e2f8f29a20e3ebe52887e8f9f00 (diff)
[SCSI] tgt: fix build when dprintk is defined
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 [tomo: > - 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, ] Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/scsi_tgt_lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index deea3cd5bf49..241815e911e7 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)
180 container_of(work, struct scsi_tgt_cmd, work); 180 container_of(work, struct scsi_tgt_cmd, work);
181 struct scsi_cmnd *cmd = tcmd->rq->special; 181 struct scsi_cmnd *cmd = tcmd->rq->special;
182 182
183 dprintk("cmd %p %d %lu\n", cmd, cmd->sc_data_direction, 183 dprintk("cmd %p %d %u\n", cmd, cmd->sc_data_direction,
184 rq_data_dir(cmd->request)); 184 rq_data_dir(cmd->request));
185 scsi_unmap_user_pages(tcmd); 185 scsi_unmap_user_pages(tcmd);
186 scsi_host_put_command(scsi_tgt_cmd_to_host(cmd), cmd); 186 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)
327{ 327{
328 struct scsi_tgt_cmd *tcmd = cmd->request->end_io_data; 328 struct scsi_tgt_cmd *tcmd = cmd->request->end_io_data;
329 329
330 dprintk("cmd %p %lu\n", cmd, rq_data_dir(cmd->request)); 330 dprintk("cmd %p %u\n", cmd, rq_data_dir(cmd->request));
331 331
332 scsi_tgt_uspace_send_status(cmd, tcmd->itn_id, tcmd->tag); 332 scsi_tgt_uspace_send_status(cmd, tcmd->itn_id, tcmd->tag);
333 333
@@ -342,7 +342,7 @@ static int scsi_tgt_transfer_response(struct scsi_cmnd *cmd)
342 struct Scsi_Host *shost = scsi_tgt_cmd_to_host(cmd); 342 struct Scsi_Host *shost = scsi_tgt_cmd_to_host(cmd);
343 int err; 343 int err;
344 344
345 dprintk("cmd %p %lu\n", cmd, rq_data_dir(cmd->request)); 345 dprintk("cmd %p %u\n", cmd, rq_data_dir(cmd->request));
346 346
347 err = shost->hostt->transfer_response(cmd, scsi_tgt_cmd_done); 347 err = shost->hostt->transfer_response(cmd, scsi_tgt_cmd_done);
348 switch (err) { 348 switch (err) {
@@ -497,8 +497,8 @@ int scsi_tgt_kspace_exec(int host_no, u64 itn_id, int result, u64 tag,
497 } 497 }
498 cmd = rq->special; 498 cmd = rq->special;
499 499
500 dprintk("cmd %p scb %x result %d len %d bufflen %u %lu %x\n", 500 dprintk("cmd %p scb %x result %d len %d bufflen %u %u %x\n",
501 cmd, cmd->cmnd[0], result, len, cmd->request_bufflen, 501 cmd, cmd->cmnd[0], result, len, scsi_bufflen(cmd),
502 rq_data_dir(rq), cmd->cmnd[0]); 502 rq_data_dir(rq), cmd->cmnd[0]);
503 503
504 if (result == TASK_ABORTED) { 504 if (result == TASK_ABORTED) {
@@ -618,7 +618,7 @@ int scsi_tgt_kspace_it_nexus_rsp(int host_no, u64 itn_id, int result)
618 struct Scsi_Host *shost; 618 struct Scsi_Host *shost;
619 int err = -EINVAL; 619 int err = -EINVAL;
620 620
621 dprintk("%d %d %llx\n", host_no, result, (unsigned long long) mid); 621 dprintk("%d %d%llx\n", host_no, result, (unsigned long long)itn_id);
622 622
623 shost = scsi_host_lookup(host_no); 623 shost = scsi_host_lookup(host_no);
624 if (IS_ERR(shost)) { 624 if (IS_ERR(shost)) {