1 files changed, 11 insertions, 0 deletions

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 51dc4d287add..b021e67c4294 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -180,6 +180,17 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                 }
         }
 
+        /*
+         * Mark "add" and "remove" events in the object to ensure proper
+         * events to userspace during automatic cleanup. If the object did
+         * send an "add" event, "remove" will automatically generated by
+         * the core, if not already done by the caller.
+         */
+        if (action == KOBJ_ADD)
+                kobj->state_add_uevent_sent = 1;
+        else if (action == KOBJ_REMOVE)
+                kobj->state_remove_uevent_sent = 1;
+
         /* we will send an event, so request a new sequence number */
         spin_lock(&sequence_lock);
         seq = ++uevent_seqnum;