Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 033b96fd authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

[PATCH] remove mount/umount uevents from superblock handling 



The names of these events have been confusing from the beginning
on, as they have been more like claim/release events. We needed these
events for noticing HAL if storage devices have been mounted.

Thanks to Al, we have the proper solution now and can poll()
/proc/mounts instead to get notfied about mount tree changes.

Signed-off-by: default avatarKay Sievers <kay.sievers@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0f76e5ac

fs/super.c

+1 −14
Original line number Diff line number Diff line
@@ -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);

include/linux/kobject.h

+2 −4
Original line number Diff line number Diff line
@@ -42,10 +42,8 @@ enum kobject_action { 
	KOBJ_ADD	= (__force kobject_action_t) 0x01,	/* add event, for hotplug */

	KOBJ_REMOVE	= (__force kobject_action_t) 0x02,	/* remove event, for hotplug */

	KOBJ_CHANGE	= (__force kobject_action_t) 0x03,	/* a sysfs attribute file has changed */

	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 */

	KOBJ_OFFLINE	= (__force kobject_action_t) 0x04,	/* offline event for hotplug devices */

	KOBJ_ONLINE	= (__force kobject_action_t) 0x05,	/* online event for hotplug devices */

};



struct kobject {

lib/kobject_uevent.c

+0 −4
Original line number Diff line number Diff line
@@ -39,10 +39,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: