Commit 6617da58 authored by James Bottomley's avatar James Bottomley

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
parent e9788df6
...@@ -1216,8 +1216,6 @@ static int sd_attach(struct scsi_device * sdp) ...@@ -1216,8 +1216,6 @@ static int sd_attach(struct scsi_device * sdp)
sdkp->driver = &sd_template; sdkp->driver = &sd_template;
sdkp->disk = gd; sdkp->disk = gd;
sd_init_onedisk(sdkp, gd);
gd->de = sdp->de; gd->de = sdp->de;
gd->major = SD_MAJOR(dsk_nr>>4); gd->major = SD_MAJOR(dsk_nr>>4);
gd->first_minor = (dsk_nr & 15)<<4; gd->first_minor = (dsk_nr & 15)<<4;
...@@ -1226,6 +1224,9 @@ static int sd_attach(struct scsi_device * sdp) ...@@ -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); sprintf(gd->disk_name, "sd%c%c",'a'+dsk_nr/26-1,'a'+dsk_nr%26);
else else
sprintf(gd->disk_name, "sd%c",'a'+dsk_nr%26); sprintf(gd->disk_name, "sd%c",'a'+dsk_nr%26);
sd_init_onedisk(sdkp, gd);
gd->driverfs_dev = &sdp->sdev_driverfs_dev; gd->driverfs_dev = &sdp->sdev_driverfs_dev;
gd->flags = GENHD_FL_DRIVERFS | GENHD_FL_DEVFS; gd->flags = GENHD_FL_DRIVERFS | GENHD_FL_DEVFS;
if (sdp->removable) if (sdp->removable)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment