restore superblock mount/umount uevents
Subsystems (3)
PATCH 1/1 restore superblock mount/umount uevents
From: Pekka Enberg <[email protected]>
This patch fixes an userspace regression caused by "[PATCH] remove mount/umount uevents from superblock handling" where gnome-volume-manager no longer detects plugged in devices. You can find a complete bug description
here: http://bugzilla.kernel.org/show_bug.cgi?id=6021.
I have tested this patch on Gentoo Linux running HAL 0.5.5.1.
---
fs/super.c +14 -1
@@ -666,6 +666,16 @@ static int test_bdev_super(struct super_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); +else +kobject_uevent (&bdev->bd_disk->kobj, action); + } +} +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 ))
@@ -707,8 +717,10 @@ struct super_block *get_sb_bdev(struct fup_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;
@@ -724,6 +736,7 @@ void kill_block_super(struct super_block {struct block_device *bdev = sb->s_bdev; +bdev_uevent (bdev,KOBJ_UMOUNT );generic_shutdown_super (sb);sync_blockdev (bdev);close_bdev_excl (bdev);
include/linux/kobject.h +4 -2
@@ -41,8 +41,10 @@ enum kobject_action {KOBJ_ADD = (__force kobject_action_t )0x01 ,/* exclusive to core */ KOBJ_REMOVE = (__force kobject_action_t )0x02 ,/* exclusive to core */ KOBJ_CHANGE = (__force kobject_action_t )0x03 ,/* device state change */ -KOBJ_OFFLINE = (__force kobject_action_t )0x04 ,/* device offline */ - KOBJ_ONLINE = (__force kobject_action_t) 0x05, /* device online */ +KOBJ_MOUNT = (__force kobject_action_t )0x04 ,/* mount event for block devices */ +KOBJ_UMOUNT = (__force kobject_action_t )0x05 ,/* umount event for block devices */ +KOBJ_OFFLINE = (__force kobject_action_t )0x06 ,/* offline event for hotplug devices */ + KOBJ_ONLINE = (__force kobject_action_t) 0x07, /* online event for hotplug devices */ }; struct kobject {
lib/kobject_uevent.c +4 -0
@@ -38,6 +38,10 @@ static char *action_to_string(enum kobjereturn "remove" ;case KOBJ_CHANGE :return "change" ; +case KOBJ_MOUNT : +return "mount" ; +case KOBJ_UMOUNT : +return "umount" ;case KOBJ_OFFLINE :return "offline" ;case KOBJ_ONLINE :
Quoted 8 lines · Pekka Enberg
From: Pekka Enberg <[email protected]>
This patch fixes an userspace regression caused by "[PATCH] remove mount/umount uevents from superblock handling" where gnome-volume-manager no longer detects plugged in devices. You can find a complete bug description
here: http://bugzilla.kernel.org/show_bug.cgi?id=6021.I have tested this patch on Gentoo Linux running HAL 0.5.5.1.
Heh, I sent this a few minutes before to Linus and lkml :)
thanks,
greg k-h