Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 06:43:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Trivial fixes and cleanups:
- unneeded variable removals, by ye xingchen
This commit is contained in:
Vlastimil Babka 2022-09-23 10:29:53 +02:00
commit 0467ca385f
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mm/slab_common.c
View File

@ -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);

9
mm/slub.c
View File

@ -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)