Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8aae4d3 authored by Randy Dunlap's avatar Randy Dunlap Committed by James Bottomley
Browse files

[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: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Acked-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent f3307f72

drivers/scsi/scsi_tgt_lib.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -180,7 +180,7 @@ static void scsi_tgt_cmd_destroy(struct work_struct *work) 
		container_of(work, struct scsi_tgt_cmd, work);

		container_of(work, struct scsi_tgt_cmd, work);

	struct scsi_cmnd *cmd = tcmd->rq->special;

	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));

		rq_data_dir(cmd->request));

	scsi_unmap_user_pages(tcmd);

	scsi_unmap_user_pages(tcmd);

	scsi_host_put_command(scsi_tgt_cmd_to_host(cmd), cmd);

	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;

	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);

	scsi_tgt_uspace_send_status(cmd, tcmd->itn_id, tcmd->tag);
@@ -342,7 +342,7 @@ static int scsi_tgt_transfer_response(struct scsi_cmnd *cmd) 
	struct Scsi_Host *shost = scsi_tgt_cmd_to_host(cmd);

	struct Scsi_Host *shost = scsi_tgt_cmd_to_host(cmd);

	int err;

	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);

	err = shost->hostt->transfer_response(cmd, scsi_tgt_cmd_done);

	switch (err) {

	switch (err) {
@@ -497,8 +497,8 @@ int scsi_tgt_kspace_exec(int host_no, u64 itn_id, int result, u64 tag, 
	}

	}

	cmd = rq->special;

	cmd = rq->special;





	dprintk("cmd %p scb %x result %d len %d bufflen %u %lu %x\n",

	dprintk("cmd %p scb %x result %d len %d bufflen %u %u %x\n",

		cmd, cmd->cmnd[0], result, len, cmd->request_bufflen,

		cmd, cmd->cmnd[0], result, len, scsi_bufflen(cmd),

		rq_data_dir(rq), cmd->cmnd[0]);

		rq_data_dir(rq), cmd->cmnd[0]);





	if (result == TASK_ABORTED) {

	if (result == TASK_ABORTED) {
@@ -618,7 +618,7 @@ int scsi_tgt_kspace_it_nexus_rsp(int host_no, u64 itn_id, int result) 
	struct Scsi_Host *shost;

	struct Scsi_Host *shost;

	int err = -EINVAL;

	int err = -EINVAL;





	dprintk("%d %d %llx\n", host_no, result, (unsigned long long) mid);

	dprintk("%d %d%llx\n", host_no, result, (unsigned long long)itn_id);





	shost = scsi_host_lookup(host_no);

	shost = scsi_host_lookup(host_no);

	if (IS_ERR(shost)) {

	if (IS_ERR(shost)) {