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

Commit 3bf743e7 authored by Jeff Garzik's avatar Jeff Garzik Committed by James Bottomley
Browse files

[SCSI] use {sdev,scmd,starget,shost}_printk in generic code 



rejections fixed and
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 01d7b3b8

drivers/scsi/scsi.c

+3 −2
Original line number Diff line number Diff line
@@ -889,8 +889,9 @@ void scsi_finish_command(struct scsi_cmnd *cmd) 
	if (SCSI_SENSE_VALID(cmd))

		cmd->result |= (DRIVER_SENSE << 24);



	SCSI_LOG_MLCOMPLETE(4, printk("Notifying upper driver of completion "

				"for device %d %x\n", sdev->id, cmd->result));

	SCSI_LOG_MLCOMPLETE(4, sdev_printk(KERN_INFO, sdev,

				"Notifying upper driver of completion "

				"(result %x)\n", cmd->result));



	/*

	 * We can get here with use_sg=0, causing a panic in the upper level

drivers/scsi/scsi_debug.c

+6 −9
Original line number Diff line number Diff line
@@ -1008,8 +1008,7 @@ static void timer_intr_handler(unsigned long indx) 
static int scsi_debug_slave_alloc(struct scsi_device * sdp)

{

	if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts)

		printk(KERN_INFO "scsi_debug: slave_alloc <%u %u %u %u>\n",

		       sdp->host->host_no, sdp->channel, sdp->id, sdp->lun);

		sdev_printk(KERN_INFO, sdp, "scsi_debug: slave_alloc\n");

	return 0;

}
@@ -1018,8 +1017,7 @@ static int scsi_debug_slave_configure(struct scsi_device * sdp) 
	struct sdebug_dev_info * devip;



	if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts)

		printk(KERN_INFO "scsi_debug: slave_configure <%u %u %u %u>\n",

		       sdp->host->host_no, sdp->channel, sdp->id, sdp->lun);

		sdev_printk(KERN_INFO, sdp, "scsi_debug: slave_configure\n");

	if (sdp->host->max_cmd_len != SCSI_DEBUG_MAX_CMD_LEN)

		sdp->host->max_cmd_len = SCSI_DEBUG_MAX_CMD_LEN;

	devip = devInfoReg(sdp);
@@ -1036,8 +1034,7 @@ static void scsi_debug_slave_destroy(struct scsi_device * sdp) 
				(struct sdebug_dev_info *)sdp->hostdata;



	if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts)

		printk(KERN_INFO "scsi_debug: slave_destroy <%u %u %u %u>\n",

		       sdp->host->host_no, sdp->channel, sdp->id, sdp->lun);

		sdev_printk(KERN_INFO, sdp, "scsi_debug: slave_destroy\n");

	if (devip) {

		/* make this slot avaliable for re-use */

		devip->used = 0;
@@ -1326,9 +1323,9 @@ static int schedule_resp(struct scsi_cmnd * cmnd, 
		if (scsi_result) {

			struct scsi_device * sdp = cmnd->device;



			printk(KERN_INFO "scsi_debug:    <%u %u %u %u> "

			       "non-zero result=0x%x\n", sdp->host->host_no,

			       sdp->channel, sdp->id, sdp->lun, scsi_result);

			sdev_printk(KERN_INFO, sdp,

				"non-zero result=0x%x\n",

			       	scsi_result);

		}

	}

	if (cmnd && devip) {

drivers/scsi/scsi_error.c

+3 −4
Original line number Diff line number Diff line
@@ -673,10 +673,9 @@ static int scsi_eh_get_sense(struct list_head *work_q, 
		    SCSI_SENSE_VALID(scmd))

			continue;



		SCSI_LOG_ERROR_RECOVERY(2, printk("%s: requesting sense"

						  " for id: %d\n",

						  current->comm,

						  scmd->device->id));

		SCSI_LOG_ERROR_RECOVERY(2, scmd_printk(KERN_INFO, scmd,

						  "%s: requesting sense\n",

						  current->comm));

		rtn = scsi_request_sense(scmd);

		if (rtn != SUCCESS)

			continue;

drivers/scsi/scsi_lib.c

+6 −9
Original line number Diff line number Diff line
@@ -951,15 +951,13 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes, 
				return;

			}

			if (!(req->flags & REQ_QUIET))

				sdev_printk(KERN_INFO,

					    cmd->device,

				scmd_printk(KERN_INFO, cmd,

					   "Device not ready.\n");

			scsi_end_request(cmd, 0, this_count, 1);

			return;

		case VOLUME_OVERFLOW:

			if (!(req->flags & REQ_QUIET)) {

				sdev_printk(KERN_INFO,

					    cmd->device,

				scmd_printk(KERN_INFO, cmd,

					   "Volume overflow, CDB: ");

				__scsi_print_command(cmd->data_cmnd);

				scsi_print_sense("", cmd);
@@ -981,9 +979,8 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes, 
	}

	if (result) {

		if (!(req->flags & REQ_QUIET)) {

			sdev_printk(KERN_INFO, cmd->device,

				    "SCSI error: return code = 0x%x\n",

				    result);

			scmd_printk(KERN_INFO, cmd,

				   "SCSI error: return code = 0x%x\n", result);



			if (driver_byte(result) & DRIVER_SENSE)

				scsi_print_sense("", cmd);

drivers/scsi/scsi_scan.c

+9 −8
Original line number Diff line number Diff line
@@ -1189,9 +1189,8 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, 
		num_luns = max_scsi_report_luns;

	}



	SCSI_LOG_SCAN_BUS(3, printk (KERN_INFO "scsi scan: REPORT LUN scan of"

			" host %d channel %d id %d\n", sdev->host->host_no,

			sdev->channel, sdev->id));

	SCSI_LOG_SCAN_BUS(3, sdev_printk (KERN_INFO, sdev,

		"scsi scan: REPORT LUN scan\n"));



	/*

	 * Scan the luns in lun_data. The entry at offset 0 is really
@@ -1230,9 +1229,10 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, 
				/*

				 * Got some results, but now none, abort.

				 */

				printk(KERN_ERR "scsi: Unexpected response"

				       " from %s lun %d while scanning, scan"

				       " aborted\n", devname, lun);

				sdev_printk(KERN_ERR, sdev,

					"Unexpected response"

				        " from lun %d while scanning, scan"

				        " aborted\n", lun);

				break;

			}

		}
@@ -1417,8 +1417,9 @@ static void scsi_scan_channel(struct Scsi_Host *shost, unsigned int channel, 
int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,

			    unsigned int id, unsigned int lun, int rescan)

{

	SCSI_LOG_SCAN_BUS(3, printk (KERN_INFO "%s: <%u:%u:%u:%u>\n",

		__FUNCTION__, shost->host_no, channel, id, lun));

	SCSI_LOG_SCAN_BUS(3, shost_printk (KERN_INFO, shost,

		"%s: <%u:%u:%u>\n",

		__FUNCTION__, channel, id, lun));



	if (((channel != SCAN_WILD_CARD) && (channel > shost->max_channel)) ||

	    ((id != SCAN_WILD_CARD) && (id > shost->max_id)) ||