From f6e0f69bc51b4df0ef88631af15e1544c8b4aa33 Mon Sep 17 00:00:00 2001 From: Nao Nishijima Date: Thu, 25 Aug 2011 18:04:14 +0900 Subject: [PATCH] --- yaml --- r: 271027 b: refs/heads/master c: fe2d1851e9dc69da8de5dfe3fc748d041c31e25a h: refs/heads/master i: 271025: 8b1e0c790724c1eaa882b47fd4a694c61891345b 271023: c28d65011d8cd65f71b4eae69c046894f3c9cb40 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 160343e29434..d5ad49845a0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a72c5e5eb738033938ab30d6a634b74d1d060f10 +refs/heads/master: fe2d1851e9dc69da8de5dfe3fc748d041c31e25a diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index 953773cb26d9..a7942e5c8be8 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/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