[Patch] sg: fix device number in blktrace data

[Patch] sg: fix device number in blktrace data

[Martin Peschke]

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>

---
 drivers/scsi/sg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1078,7 +1078,7 @@ sg_ioctl(struct inode *inode, struct fil
 	case BLKTRACESETUP:
 		return blk_trace_setup(sdp->device->request_queue,
 				       sdp->disk->disk_name,
-				       sdp->device->sdev_gendev.devt,
+				       MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
 				       (char *)arg);
 	case BLKTRACESTART:
 		return blk_trace_startstop(sdp->device->request_queue, 1);

Re: [Patch] sg: fix device number in blktrace data

[Douglas Gilbert]

Martin Peschke wrote:
> 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>

Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>