Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

Trivial manual merge fixup for usb_find_interface clashes.

3 files changed, 34 insertions, 20 deletions

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 8dc1822a7022..7881ce05daef 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -226,7 +226,7 @@ static struct sysfs_ops part_sysfs_ops = {
 static ssize_t part_uevent_store(struct hd_struct * p,
                                  const char *page, size_t count)
 {
-        kobject_hotplug(&p->kobj, KOBJ_ADD);
+        kobject_uevent(&p->kobj, KOBJ_ADD);
         return count;
 }
 static ssize_t part_dev_read(struct hd_struct * p, char *page)
@@ -336,12 +336,31 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len)
         disk->part[part-1] = p;
 }
 
+static char *make_block_name(struct gendisk *disk)
+{
+        char *name;
+        static char *block_str = "block:";
+        int size;
+
+        size = strlen(block_str) + strlen(disk->disk_name) + 1;
+        name = kmalloc(size, GFP_KERNEL);
+        if (!name)
+                return NULL;
+        strcpy(name, block_str);
+        strcat(name, disk->disk_name);
+        return name;
+}
+
 static void disk_sysfs_symlinks(struct gendisk *disk)
 {
         struct device *target = get_device(disk->driverfs_dev);
         if (target) {
+                char *disk_name = make_block_name(disk);
                 sysfs_create_link(&disk->kobj,&target->kobj,"device");
-                sysfs_create_link(&target->kobj,&disk->kobj,"block");
+                if (disk_name) {
+                        sysfs_create_link(&target->kobj,&disk->kobj,disk_name);
+                        kfree(disk_name);
+                }
         }
 }
 
@@ -360,7 +379,7 @@ void register_disk(struct gendisk *disk)
         if ((err = kobject_add(&disk->kobj)))
                 return;
         disk_sysfs_symlinks(disk);
-        kobject_hotplug(&disk->kobj, KOBJ_ADD);
+        kobject_uevent(&disk->kobj, KOBJ_ADD);
 
         /* No minors to use for partitions */
         if (disk->minors == 1) {
@@ -461,10 +480,14 @@ void del_gendisk(struct gendisk *disk)
         devfs_remove_disk(disk);
 
         if (disk->driverfs_dev) {
+                char *disk_name = make_block_name(disk);
                 sysfs_remove_link(&disk->kobj, "device");
-                sysfs_remove_link(&disk->driverfs_dev->kobj, "block");
+                if (disk_name) {
+                        sysfs_remove_link(&disk->driverfs_dev->kobj, disk_name);
+                        kfree(disk_name);
+                }
                 put_device(disk->driverfs_dev);
         }
-        kobject_hotplug(&disk->kobj, KOBJ_REMOVE);
+        kobject_uevent(&disk->kobj, KOBJ_REMOVE);
         kobject_del(&disk->kobj);
 }
diff --git a/fs/super.c b/fs/super.c
index 6689dded3c84..5a347a4f673a 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -665,16 +665,6 @@ static int test_bdev_super(struct super_block *s, void *data)
         return (void *)s->s_bdev == data;
 }
 
-static void bdev_uevent(struct block_device *bdev, enum kobject_action action)
-{
-        if (bdev->bd_disk) {
-                if (bdev->bd_part)
-                        kobject_uevent(&bdev->bd_part->kobj, action, NULL);
-                else
-                        kobject_uevent(&bdev->bd_disk->kobj, action, NULL);
-        }
-}
-
 struct super_block *get_sb_bdev(struct file_system_type *fs_type,
         int flags, const char *dev_name, void *data,
         int (*fill_super)(struct super_block *, void *, int))
@@ -717,10 +707,8 @@ struct super_block *get_sb_bdev(struct file_system_type *fs_type,
                         up_write(&s->s_umount);
                         deactivate_super(s);
                         s = ERR_PTR(error);
-                } else {
+                } else
                         s->s_flags |= MS_ACTIVE;
-                        bdev_uevent(bdev, KOBJ_MOUNT);
-                }
         }
 
         return s;
@@ -736,7 +724,6 @@ void kill_block_super(struct super_block *sb)
 {
         struct block_device *bdev = sb->s_bdev;
 
-        bdev_uevent(bdev, KOBJ_UMOUNT);
         generic_shutdown_super(sb);
         sync_blockdev(bdev);
         close_bdev_excl(bdev);
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 59734ba1ee60..d36780382176 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -112,7 +112,11 @@ static int create_dir(struct kobject * k, struct dentry * p,
                         }
                 }
                 if (error && (error != -EEXIST)) {
-                        sysfs_put((*d)->d_fsdata);
+                        struct sysfs_dirent *sd = (*d)->d_fsdata;
+                        if (sd) {
+                                list_del_init(&sd->s_sibling);
+                                sysfs_put(sd);
+                        }
                         d_drop(*d);
                 }
                 dput(*d);