Commit fa0d34be authored by Martin K. Petersen's avatar Martin K. Petersen Committed by James Bottomley
Browse files

[SCSI] sd: convert logging to new printk helpers 



Convert the sd.c SCSI logging calls to scmd_printk()/sd_printk()
instead of plain printk().

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent e73aec82

drivers/scsi/sd.c

+29 −21
Original line number Diff line number Diff line
@@ -312,15 +312,19 @@ static int sd_init_command(struct scsi_cmnd * SCpnt) 
	unsigned int this_count = SCpnt->request_bufflen >> 9;

	unsigned int timeout = sdp->timeout;



	SCSI_LOG_HLQUEUE(1, printk("sd_init_command: disk=%s, block=%llu, "

			    "count=%d\n", disk->disk_name,

			 (unsigned long long)block, this_count));

	SCSI_LOG_HLQUEUE(1, scmd_printk(KERN_INFO, SCpnt,

					"sd_init_command: block=%llu, "

					"count=%d\n",

					(unsigned long long)block,

					this_count));



	if (!sdp || !scsi_device_online(sdp) ||

 	    block + rq->nr_sectors > get_capacity(disk)) {

		SCSI_LOG_HLQUEUE(2, printk("Finishing %ld sectors\n", 

		SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,

						"Finishing %ld sectors\n",

						rq->nr_sectors));

		SCSI_LOG_HLQUEUE(2, printk("Retry with 0x%p\n", SCpnt));

		SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,

						"Retry with 0x%p\n", SCpnt));

		return 0;

	}
@@ -332,8 +336,8 @@ static int sd_init_command(struct scsi_cmnd * SCpnt) 
		/* printk("SCSI disk has been changed. Prohibiting further I/O.\n"); */

		return 0;

	}

	SCSI_LOG_HLQUEUE(2, printk("%s : block=%llu\n",

				   disk->disk_name, (unsigned long long)block));

	SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt, "block=%llu\n",

					(unsigned long long)block));



	/*

	 * If we have a 1K hardware sectorsize, prevent access to single
@@ -390,9 +394,11 @@ static int sd_init_command(struct scsi_cmnd * SCpnt) 
		return 0;

	}



	SCSI_LOG_HLQUEUE(2, printk("%s : %s %d/%ld 512 byte blocks.\n", 

		disk->disk_name, (rq_data_dir(rq) == WRITE) ? 

		"writing" : "reading", this_count, rq->nr_sectors));

	SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,

					"%s %d/%ld 512 byte blocks.\n",

					(rq_data_dir(rq) == WRITE) ?

					"writing" : "reading", this_count,

					rq->nr_sectors));



	SCpnt->cmnd[1] = 0;
@@ -494,7 +500,7 @@ static int sd_open(struct inode *inode, struct file *filp) 
		return -ENXIO;





	SCSI_LOG_HLQUEUE(3, printk("sd_open: disk=%s\n", disk->disk_name));

	SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_open\n"));



	sdev = sdkp->device;
@@ -564,7 +570,7 @@ static int sd_release(struct inode *inode, struct file *filp) 
	struct scsi_disk *sdkp = scsi_disk(disk);

	struct scsi_device *sdev = sdkp->device;



	SCSI_LOG_HLQUEUE(3, printk("sd_release: disk=%s\n", disk->disk_name));

	SCSI_LOG_HLQUEUE(3, sdkp_printk(KERN_INFO, sdkp, "sd_release\n"));



	if (!--sdkp->openers && sdev->removable) {

		if (scsi_block_when_processing_errors(sdev))
@@ -677,8 +683,7 @@ static int sd_media_changed(struct gendisk *disk) 
	struct scsi_device *sdp = sdkp->device;

	int retval;



	SCSI_LOG_HLQUEUE(3, printk("sd_media_changed: disk=%s\n",

						disk->disk_name));

	SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_media_changed\n"));



	if (!sdp->removable)

		return 0;
@@ -871,12 +876,14 @@ static void sd_rw_intr(struct scsi_cmnd * SCpnt) 
			sense_deferred = scsi_sense_is_deferred(&sshdr);

	}

#ifdef CONFIG_SCSI_LOGGING

	SCSI_LOG_HLCOMPLETE(1, printk("sd_rw_intr: %s: res=0x%x\n", 

				SCpnt->request->rq_disk->disk_name, result));

	SCSI_LOG_HLCOMPLETE(1, scsi_print_result(SCpnt));

	if (sense_valid) {

		SCSI_LOG_HLCOMPLETE(1, printk("sd_rw_intr: sb[respc,sk,asc,"

				"ascq]=%x,%x,%x,%x\n", sshdr.response_code,

				sshdr.sense_key, sshdr.asc, sshdr.ascq));

		SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,

						   "sd_rw_intr: sb[respc,sk,asc,"

						   "ascq]=%x,%x,%x,%x\n",

						   sshdr.response_code,

						   sshdr.sense_key, sshdr.asc,

						   sshdr.ascq));

	}

#endif

	if (driver_byte(result) != DRIVER_SENSE &&
@@ -1467,7 +1474,8 @@ static int sd_revalidate_disk(struct gendisk *disk) 
	unsigned char *buffer;

	unsigned ordered;



	SCSI_LOG_HLQUEUE(3, printk("sd_revalidate_disk: disk=%s\n", disk->disk_name));

	SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp,

				      "sd_revalidate_disk\n"));



	/*

	 * If the device is offline, don't try and read capacity or any