Driver Core fixe for 2.6.16-rc4
Subsystems (4)
PATCH 1/1 Driver Core fixe for 2.6.16-rc4
Here is a single changeset, backing out the umount/mount uevent removal from the kernel tree. It was my fault in the first place for thinking that this event could be removed, as I was not aware the current version of HAL depended on it so much.
Please pull from:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
The patch will be sent as a follow-up message for those that wish to see it.
thanks,
greg k-h
Documentation/feature-removal-schedule.txt | 9 +++++++++ fs/super.c | 15 ++++++++++++++- include/linux/kobject.h | 6 ++++-- lib/kobject_uevent.c | 4 ++++ 4 files changed, 31 insertions(+), 3 deletions(-)
PATCH 1/1 Revert mount/umount uevent removal
This change reverts the 033b96fd30db52a710d97b06f87d16fc59fee0f1 commit from Kay Sievers that removed the mount/umount uevents from the kernel. Some older versions of HAL still depend on these events to detect when a new device has been mounted. These events are not correctly emitted, and are broken by design, and so, should not be relied upon by any future program. Instead, the /proc/mounts file should be polled to properly detect this kind of event.
A feature-removal-schedule.txt entry has been added, noting when this interface will be removed from the kernel.
---
Documentation/feature-removal-schedule.txt | 9 +++++++++ fs/super.c | 15 ++++++++++++++- include/linux/kobject.h | 6 ++++-- lib/kobject_uevent.c | 4 ++++ 4 files changed, 31 insertions(+), 3 deletions(-)
fa675765afed59bb89adba3369094ebd428b930b
Documentation/feature-removal-schedule.txt +9 -0
@@ -171,3 +171,12 @@ Why: The ISA interface is faster and sho probing is also known to cause trouble in at least one case (see bug #5889.) Who: Jean Delvare <[email protected]> + +--------------------------- + +What: mount/umount uevents +When: February 2007 +Why: These events are not correct, and do not properly let userspace know + when a file system has been mounted or unmounted. Userspace should + poll the /proc/mounts file instead to detect this properly. +Who: Greg Kroah-Hartman <[email protected]>
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 (broken) */ +KOBJ_UMOUNT = (__force kobject_action_t )0x05 ,/* umount event for block devices (broken) */ +KOBJ_OFFLINE = (__force kobject_action_t )0x06 ,/* device offline */ + KOBJ_ONLINE = (__force kobject_action_t) 0x07, /* device online */ }; 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 :