memcg, slab: do not destroy children caches if parent has aliases

[karo-tx-linux.git] / include / linux / kobject.h

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index e7ba650086ce47078bbf64353bc63a2da5007ef1..f896a33e8341e1e281ad6b19f5d75da0c4d70622 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -64,7 +64,7 @@ struct kobject {
        struct kobject          *parent;
        struct kset             *kset;
        struct kobj_type        *ktype;
-       struct sysfs_dirent     *sd;
+       struct kernfs_node      *sd;
        struct kref             kref;
 #ifdef CONFIG_DEBUG_KOBJECT_RELEASE
        struct delayed_work     release;
@@ -119,6 +119,7 @@ struct kobj_type {
 };
 
 struct kobj_uevent_env {
+       char *argv[3];
        char *envp[UEVENT_NUM_ENVP];
        int envp_idx;
        char buf[UEVENT_BUFFER_SIZE];