the overdue removal of the mount/umount uevents

This patch contains the overdue removal of the mount/umount uevents.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 6da663607f7b6c7fe9322d6d93918a0c205f2d32..ec0b4843b1cb2f41c79adf787423d4afaad14905 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -134,15 +134,6 @@ Who:       Arjan van de Ven <arjan@linux.intel.com>
 
 ---------------------------
 
-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 <gregkh@suse.de>
-
----------------------------
-
 What:  USB driver API moves to EXPORT_SYMBOL_GPL
 When:  February 2008
 Files: include/linux/usb.h, drivers/usb/core/driver.c

diff --git a/fs/super.c b/fs/super.c
index 60b1e50cbf536c25aa6c667567448cf0b4705514..8341e4e1d7380f49ce590a428456b12c88e11fed 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -725,16 +725,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);
-               else
-                       kobject_uevent(&bdev->bd_disk->kobj, action);
-       }
-}
-
 int 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),
@@ -782,7 +772,6 @@ int get_sb_bdev(struct file_system_type *fs_type,
                }
 
                s->s_flags |= MS_ACTIVE;
-               bdev_uevent(bdev, KOBJ_MOUNT);
        }
 
        return simple_set_mnt(mnt, s);
@@ -801,7 +790,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/include/linux/kobject.h b/include/linux/kobject.h
index a659a97eccf16d234581e415b3d63ab4b18eee24..eb0e63ef297ff28112620fb6b68c10bfd7579ee6 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -42,11 +42,9 @@ 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_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 */
-       KOBJ_MOVE       = (__force kobject_action_t) 0x08,      /* device move */
+       KOBJ_OFFLINE    = (__force kobject_action_t) 0x04,      /* device offline */
+       KOBJ_ONLINE     = (__force kobject_action_t) 0x05,      /* device online */
+       KOBJ_MOVE       = (__force kobject_action_t) 0x06,      /* device move */
 };
 
 struct kobject {

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index d9a3510ed2e2f198b26846445eff73390cd7aa32..12e311dc664cc8d58aa29264050e2f4a8f234e2c 100644 (file)
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -42,10 +42,6 @@ static char *action_to_string(enum kobject_action action)
                return "remove";
        case KOBJ_CHANGE:
                return "change";
-       case KOBJ_MOUNT:
-               return "mount";
-       case KOBJ_UMOUNT:
-               return "umount";
        case KOBJ_OFFLINE:
                return "offline";
        case KOBJ_ONLINE: