Commit 76e3a19d authored Jan 30, 2009 by Martin Peschke Committed by James Bottomley Feb 10, 2009

[SCSI] sg: fix device number in blktrace data



Hi,

we have run into an issue with blktrace being started for sg devices.
Please apply.

Thanks,
Martin

From: Martin Peschke <mpeschke@linux.vnet.ibm.com>

The device number denoting a generic SCSI devices (sg) in a blktrace
trace is broken; major and minor are always 0. It looks like
sdp->device->sdev_gendev.devt is not initialized properly.
The fix below uses other data to make up a valid device number,
similar to the way an sg device number is generated for sysfs output.

Reported-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: Martin Peschke <mpeschke@linux.vnet.ibm.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent c2f9e49f

drivers/scsi/sg.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1078,7 +1078,7 @@ sg_ioctl(struct inode inode, struct file filp,
	case BLKTRACESETUP:		case BLKTRACESETUP:
	return blk_trace_setup(sdp->device->request_queue,		return blk_trace_setup(sdp->device->request_queue,
	sdp->disk->disk_name,		sdp->disk->disk_name,
	sdp->device->sdev_gendev.devt,		MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
	(char *)arg);		(char *)arg);
	case BLKTRACESTART:		case BLKTRACESTART:
	return blk_trace_startstop(sdp->device->request_queue, 1);		return blk_trace_startstop(sdp->device->request_queue, 1);