Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3106d46f51a1a72fdbf071ebc0800a9bcfcbc544
Commit: 3106d46f51a1a72fdbf071ebc0800a9bcfcbc544
Parent: 2753133eb3321feb81dcb9c88141dd2aa5973ee1
Author: Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Fri Apr 6 12:21:45 2007 +0200
Committer: Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Fri Apr 27 10:57:31 2007 -0700
the overdue removal of the mount/umount uevents
This patch contains the overdue removal of the mount/umount uevents.
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
Documentation/feature-removal-schedule.txt | 9 ---------
fs/super.c | 12 ------------
include/linux/kobject.h | 8 +++-----
lib/kobject_uevent.c | 4 ----
4 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/Documentation/feature-removal-schedule.txt
b/Documentation/feature-removal-schedule.txt
index 6da6636..ec0b484 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -134,15 +134,6 @@ Who: Arjan van de Ven <[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]>
-
----------------------------
-
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 60b1e50..8341e4e 100644
--- 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 a659a97..eb0e63e 100644
--- 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 d9a3510..12e311d 100644
--- 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:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
