summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorVlastimil Babka <vbabka@suse.cz>2022-09-23 11:29:53 +0300
committerVlastimil Babka <vbabka@suse.cz>2022-09-23 11:29:53 +0300
commit0467ca385f406e1cdfee92f86b1a26c3bcf7cdb3 (patch)
treee71f6d350bf94b5f15dfd7c059c40988c6d1e247 /mm
parente45cc288724f0cfd497bb5920bcfa60caa335729 (diff)
parent2bfbb0271a5b48c01c711d1509a422a7244c9eb8 (diff)
downloadlinux-0467ca385f406e1cdfee92f86b1a26c3bcf7cdb3.tar.xz
Merge branch 'slab/for-6.1/trivial' into slab/for-next
Trivial fixes and cleanups: - unneeded variable removals, by ye xingchen
Diffstat (limited to 'mm')
-rw-r--r--mm/slab_common.c6
-rw-r--r--mm/slub.c9
2 files changed, 3 insertions, 12 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c
index ccc02573588f..2180d0612353 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -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);
diff --git a/mm/slub.c b/mm/slub.c
index 4b98dff9be8e..a48ac10a1153 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -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)