diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:54 +0100 |
| commit | 0ea97d66df2a8b85698823b4d55d798a7870d7b5 (patch) | |
| tree | e4f36af1342ebcbcb5878e66b1e72661b6f2ca1d /mm/slub.c | |
| parent | eed41b9f413f40183095d27ffc94fb942fe18bb6 (diff) | |
| parent | 6183a1afdd2fb1c994e95af9d6db45f157241a04 (diff) | |
Merge branch 'linux-linaro-lsk-v4.14' into linux-linaro-lsk-v4.14-rtlsk-v4.14-18.07-rt
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index 9ce21fa2c64c..6c238ee56667 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -5736,7 +5736,6 @@ static void sysfs_slab_remove_workfn(struct work_struct *work) kset_unregister(s->memcg_kset); #endif kobject_uevent(&s->kobj, KOBJ_REMOVE); - kobject_del(&s->kobj); out: kobject_put(&s->kobj); } @@ -5821,6 +5820,12 @@ static void sysfs_slab_remove(struct kmem_cache *s) schedule_work(&s->kobj_remove_work); } +void sysfs_slab_unlink(struct kmem_cache *s) +{ + if (slab_state >= FULL) + kobject_del(&s->kobj); +} + void sysfs_slab_release(struct kmem_cache *s) { if (slab_state >= FULL) |