Commit 0467ca38 authored by Vlastimil Babka's avatar Vlastimil Babka
Browse files

Merge branch 'slab/for-6.1/trivial' into slab/for-next 

Trivial fixes and cleanups:
- unneeded variable removals, by ye xingchen
parents e45cc288 2bfbb027

mm/slab_common.c

+1 −5
Original line number Diff line number Diff line
@@ -511,13 +511,9 @@ EXPORT_SYMBOL(kmem_cache_destroy); 
 */

int kmem_cache_shrink(struct kmem_cache *cachep)

{

	int ret;





	kasan_cache_shrink(cachep);

	ret = __kmem_cache_shrink(cachep);



	return ret;

	return __kmem_cache_shrink(cachep);

}

EXPORT_SYMBOL(kmem_cache_shrink);

mm/slub.c

+2 −7
Original line number Diff line number Diff line
@@ -5837,7 +5837,6 @@ static ssize_t slab_attr_show(struct kobject *kobj, 
{

	struct slab_attribute *attribute;

	struct kmem_cache *s;

	int err;



	attribute = to_slab_attr(attr);

	s = to_slab(kobj);
@@ -5845,9 +5844,7 @@ static ssize_t slab_attr_show(struct kobject *kobj, 
	if (!attribute->show)

		return -EIO;



	err = attribute->show(s, buf);



	return err;

	return attribute->show(s, buf);

}



static ssize_t slab_attr_store(struct kobject *kobj,
@@ -5856,7 +5853,6 @@ static ssize_t slab_attr_store(struct kobject *kobj, 
{

	struct slab_attribute *attribute;

	struct kmem_cache *s;

	int err;



	attribute = to_slab_attr(attr);

	s = to_slab(kobj);
@@ -5864,8 +5860,7 @@ static ssize_t slab_attr_store(struct kobject *kobj, 
	if (!attribute->store)

		return -EIO;



	err = attribute->store(s, buf, len);

	return err;

	return attribute->store(s, buf, len);

}



static void kmem_cache_release(struct kobject *k)