[PATCH] Remove the scsi_disk devfs_name field as it's no longer needed

[Greg KH]

Also fixes all drivers that set this field.

Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
 drivers/scsi/scsi_scan.c   |    6 +-----
 include/scsi/scsi_device.h |    1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

--- gregkh-2.6.orig/drivers/scsi/scsi_scan.c	2005-06-10 23:28:57.000000000 -0700
+++ gregkh-2.6/drivers/scsi/scsi_scan.c	2005-06-10 23:37:25.000000000 -0700
@@ -666,12 +666,8 @@
 	if (inq_result[7] & 0x10)
 		sdev->sdtr = 1;
 
-	sprintf(sdev->devfs_name, "scsi/host%d/bus%d/target%d/lun%d",
-				sdev->host->host_no, sdev->channel,
-				sdev->id, sdev->lun);
-
 	/*
-	 * End driverfs/devfs code.
+	 * End driverfs code.
 	 */
 
 	if ((sdev->scsi_level >= SCSI_2) && (inq_result[7] & 2) &&
--- gregkh-2.6.orig/include/scsi/scsi_device.h	2005-06-10 23:28:57.000000000 -0700
+++ gregkh-2.6/include/scsi/scsi_device.h	2005-06-10 23:37:25.000000000 -0700
@@ -64,7 +64,6 @@
 	unsigned sector_size;	/* size in bytes */
 
 	void *hostdata;		/* available to low-level driver */
-	char devfs_name[256];	/* devfs junk */
 	char type;
 	char scsi_level;
 	char inq_periph_qual;	/* PQ from INQUIRY data */	

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/