1 files changed, 23 insertions, 7 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 9636135ee0779..5d54f77561007 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -73,6 +73,8 @@
 
 struct ide_disk_obj {
 	ide_drive_t	*drive;
+	ide_driver_t	*driver;
+	struct gendisk	*disk;
 	struct kref	kref;
 };
 
@@ -80,7 +82,8 @@ static DECLARE_MUTEX(idedisk_ref_sem);
 
 #define to_ide_disk(obj) container_of(obj, struct ide_disk_obj, kref)
 
-#define ide_disk_g(disk) ((disk)->private_data)
+#define ide_disk_g(disk) \
+	container_of((disk)->private_data, struct ide_disk_obj, driver)
 
 static struct ide_disk_obj *ide_disk_get(struct gendisk *disk)
 {
@@ -1024,7 +1027,7 @@ static void ide_cacheflush_p(ide_drive_t *drive)
 static int idedisk_cleanup (ide_drive_t *drive)
 {
 	struct ide_disk_obj *idkp = drive->driver_data;
-	struct gendisk *g = drive->disk;
+	struct gendisk *g = idkp->disk;
 
 	ide_cacheflush_p(drive);
 	if (ide_unregister_subdriver(drive))
@@ -1040,12 +1043,12 @@ static void ide_disk_release(struct kref *kref)
 {
 	struct ide_disk_obj *idkp = to_ide_disk(kref);
 	ide_drive_t *drive = idkp->drive;
-	struct gendisk *g = drive->disk;
+	struct gendisk *g = idkp->disk;
 
 	drive->driver_data = NULL;
 	drive->devfs_name[0] = '\0';
 	g->private_data = NULL;
-	g->fops = ide_fops;
+	put_disk(g);
 	kfree(idkp);
 }
 
@@ -1199,7 +1202,7 @@ MODULE_DESCRIPTION("ATA DISK Driver");
 static int idedisk_attach(ide_drive_t *drive)
 {
 	struct ide_disk_obj *idkp;
-	struct gendisk *g = drive->disk;
+	struct gendisk *g;
 
 	/* strstr("foo", "") is non-NULL */
 	if (!strstr("ide-disk", drive->driver_req))
@@ -1213,9 +1216,15 @@ static int idedisk_attach(ide_drive_t *drive)
 	if (!idkp)
 		goto failed;
 
+	g = alloc_disk(1 << PARTN_BITS);
+	if (!g)
+		goto out_free_idkp;
+
+	ide_init_disk(g, drive);
+
 	if (ide_register_subdriver(drive, &idedisk_driver)) {
 		printk (KERN_ERR "ide-disk: %s: Failed to register the driver with ide.c\n", drive->name);
-		goto out_free_idkp;
+		goto out_put_disk;
 	}
 
 	memset(idkp, 0, sizeof(*idkp));
@@ -1223,6 +1232,11 @@ static int idedisk_attach(ide_drive_t *drive)
 	kref_init(&idkp->kref);
 
 	idkp->drive = drive;
+	idkp->driver = &idedisk_driver;
+	idkp->disk = g;
+
+	g->private_data = &idkp->driver;
+
 	drive->driver_data = idkp;
 
 	DRIVER(drive)->busy++;
@@ -1240,9 +1254,11 @@ static int idedisk_attach(ide_drive_t *drive)
 	g->flags = drive->removable ? GENHD_FL_REMOVABLE : 0;
 	set_capacity(g, idedisk_capacity(drive));
 	g->fops = &idedisk_ops;
-	g->private_data = idkp;
 	add_disk(g);
 	return 0;
+
+out_put_disk:
+	put_disk(g);
 out_free_idkp:
 	kfree(idkp);
 failed: