---

yaml --- r: 271027 b: refs/heads/master c: fe2d185 h: refs/heads/master i: 271025: 8b1e0c7 271023: c28d650 v: v3
git-mirror · Aug 29, 2011 · f6e0f69 · f6e0f69
1 parent 090df59
commit f6e0f69
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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