diff options
| author | Nao Nishijima <nao.nishijima.xt@hitachi.com> | 2011-08-25 18:04:14 +0900 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-08-29 00:16:20 -0700 |
| commit | fe2d1851e9dc69da8de5dfe3fc748d041c31e25a (patch) | |
| tree | 06bcf345255dcb0265622cadcff2d567cebc0be0 /drivers | |
| parent | a72c5e5eb738033938ab30d6a634b74d1d060f10 (diff) | |
[SCSI] sd: Use sd_printk() instead of printk()
sd_ioctl() still use printk() for log output.
It should use sd_printk() instead of printk(), as well as other sd_*.
All SCSI messages should output via s*_printk() instead of printk().
Signed-off-by: Nao Nishijima <nao.nishijima.xt@hitachi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/sd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 953773cb26d..a7942e5c8be 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1066,12 +1066,13 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { struct gendisk *disk = bdev->bd_disk; - struct scsi_device *sdp = scsi_disk(disk)->device; + struct scsi_disk *sdkp = scsi_disk(disk); + struct scsi_device *sdp = sdkp->device; void __user *p = (void __user *)arg; int error; - SCSI_LOG_IOCTL(1, printk("sd_ioctl: disk=%s, cmd=0x%x\n", - disk->disk_name, cmd)); + SCSI_LOG_IOCTL(1, sd_printk(KERN_INFO, sdkp, "sd_ioctl: disk=%s, " + "cmd=0x%x\n", disk->disk_name, cmd)); /* * If we are in the middle of error recovery, don't let anyone |