From e8227c8853c8dc3f42a3dfdad80fd3e0581442e2 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 12 May 2006 18:42:09 -0700 Subject: [PATCH] --- yaml --- r: 26691 b: refs/heads/master c: 032ebf2620ef99a4fedaa0f77dc2272095ac5863 h: refs/heads/master i: 26689: 32c9e9bea9b71351fe4e06acedb869ff794ca918 26687: 2d546db45c94b180f2cc162fe6630f040e6115cd v: v3 --- [refs] | 2 +- trunk/fs/partitions/check.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 71d9ebde8b5f..cddda720debb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18552b8f227bddf569dade5c69798a37839ea913 +refs/heads/master: 032ebf2620ef99a4fedaa0f77dc2272095ac5863 diff --git a/trunk/fs/partitions/check.c b/trunk/fs/partitions/check.c index 45ae7dd3c650..7ef1f094de91 100644 --- a/trunk/fs/partitions/check.c +++ b/trunk/fs/partitions/check.c @@ -533,6 +533,7 @@ void del_gendisk(struct gendisk *disk) devfs_remove_disk(disk); + kobject_uevent(&disk->kobj, KOBJ_REMOVE); if (disk->holder_dir) kobject_unregister(disk->holder_dir); if (disk->slave_dir) @@ -545,7 +546,7 @@ void del_gendisk(struct gendisk *disk) kfree(disk_name); } put_device(disk->driverfs_dev); + disk->driverfs_dev = NULL; } - kobject_uevent(&disk->kobj, KOBJ_REMOVE); kobject_del(&disk->kobj); }