|
@@ -214,11 +214,13 @@ enum track_item { TRACK_ALLOC, TRACK_FREE };
|
|
|
static int sysfs_slab_add(struct kmem_cache *);
|
|
|
static int sysfs_slab_alias(struct kmem_cache *, const char *);
|
|
|
static void memcg_propagate_slab_attrs(struct kmem_cache *s);
|
|
|
+static void sysfs_slab_remove(struct kmem_cache *s);
|
|
|
#else
|
|
|
static inline int sysfs_slab_add(struct kmem_cache *s) { return 0; }
|
|
|
static inline int sysfs_slab_alias(struct kmem_cache *s, const char *p)
|
|
|
{ return 0; }
|
|
|
static inline void memcg_propagate_slab_attrs(struct kmem_cache *s) { }
|
|
|
+static inline void sysfs_slab_remove(struct kmem_cache *s) { }
|
|
|
#endif
|
|
|
|
|
|
static inline void stat(const struct kmem_cache *s, enum stat_item si)
|
|
@@ -3687,6 +3689,7 @@ int __kmem_cache_shutdown(struct kmem_cache *s)
|
|
|
if (n->nr_partial || slabs_node(s, node))
|
|
|
return 1;
|
|
|
}
|
|
|
+ sysfs_slab_remove(s);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -5637,7 +5640,7 @@ out_del_kobj:
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
-void sysfs_slab_remove(struct kmem_cache *s)
|
|
|
+static void sysfs_slab_remove(struct kmem_cache *s)
|
|
|
{
|
|
|
if (slab_state < FULL)
|
|
|
/*
|
|
@@ -5651,7 +5654,12 @@ void sysfs_slab_remove(struct kmem_cache *s)
|
|
|
#endif
|
|
|
kobject_uevent(&s->kobj, KOBJ_REMOVE);
|
|
|
kobject_del(&s->kobj);
|
|
|
- kobject_put(&s->kobj);
|
|
|
+}
|
|
|
+
|
|
|
+void sysfs_slab_release(struct kmem_cache *s)
|
|
|
+{
|
|
|
+ if (slab_state >= FULL)
|
|
|
+ kobject_put(&s->kobj);
|
|
|
}
|
|
|
|
|
|
/*
|