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

Trivial fixes and cleanups:
- unneeded variable removals, by ye xingchen

diff --git a/mm/slab_common.c b/mm/slab_common.c
index ccc02573588f843f2da0d5c8ec128c2ad2bcbd88..2180d0612353fe15a8a16f868e7b381d29081062 100644 (file)
--- 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 4b98dff9be8e33baee842db0fa398964add5a2dd..a48ac10a11534ba0364172d629cedcdfcb489eb0 100644 (file)
--- 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)