Skip to content

Commit efb9352

Browse files
Xiongwei Songtehcaster
authored andcommitted
mm/slub: Simplify __kmem_cache_alias()
There is no need to do anything if sysfs_slab_alias() return nonzero value after getting a mergeable cache. Signed-off-by: Xiongwei Song <[email protected]> Reviewed-by: Muchun Song <[email protected]> Link: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Vlastimil Babka <[email protected]>
1 parent d1ca263 commit efb9352

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

mm/slub.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4890,6 +4890,9 @@ __kmem_cache_alias(const char *name, unsigned int size, unsigned int align,
48904890

48914891
s = find_mergeable(size, align, flags, name, ctor);
48924892
if (s) {
4893+
if (sysfs_slab_alias(s, name))
4894+
return NULL;
4895+
48934896
s->refcount++;
48944897

48954898
/*
@@ -4898,11 +4901,6 @@ __kmem_cache_alias(const char *name, unsigned int size, unsigned int align,
48984901
*/
48994902
s->object_size = max(s->object_size, size);
49004903
s->inuse = max(s->inuse, ALIGN(size, sizeof(void *)));
4901-
4902-
if (sysfs_slab_alias(s, name)) {
4903-
s->refcount--;
4904-
s = NULL;
4905-
}
49064904
}
49074905

49084906
return s;

0 commit comments

Comments
 (0)