|
@@ -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
|