diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2002-11-17 04:11:17 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2002-11-17 04:11:17 -0600 |
| commit | 6617da587480e44525504fa78436b8eb1c17b7f5 (patch) | |
| tree | 462e69d3afeb3a71c7822c37011af20bad107d43 | |
| parent | e9788df6e3939575a40600f7910db6fc1fc184d0 (diff) | |
move sd_init_onedisk so that the disk name is usable
After the gendisk changes, the disk name disappeared from the
initialisation methods (sd_spinup et al) because the disk name
is set after the init routines are called. This moves init to be
after the name is set
| -rw-r--r-- | drivers/scsi/sd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index c347966cfb02..71870713a5bc 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1216,8 +1216,6 @@ static int sd_attach(struct scsi_device * sdp) sdkp->driver = &sd_template; sdkp->disk = gd; - sd_init_onedisk(sdkp, gd); - gd->de = sdp->de; gd->major = SD_MAJOR(dsk_nr>>4); gd->first_minor = (dsk_nr & 15)<<4; @@ -1226,6 +1224,9 @@ static int sd_attach(struct scsi_device * sdp) sprintf(gd->disk_name, "sd%c%c",'a'+dsk_nr/26-1,'a'+dsk_nr%26); else sprintf(gd->disk_name, "sd%c",'a'+dsk_nr%26); + + sd_init_onedisk(sdkp, gd); + gd->driverfs_dev = &sdp->sdev_driverfs_dev; gd->flags = GENHD_FL_DRIVERFS | GENHD_FL_DEVFS; if (sdp->removable) |