[PATCH] slab: trivial: cleanup: remove unneeded return

[PATCH] slab: trivial: cleanup: remove unneeded return

[Zhao Jin]

The procedure ends right after the if-statement, so remove ``return'';
also move the last common statement outside.

Signed-off-by: Zhao Jin <cronozhj@gmail.com>
---
 mm/slab.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/slab.c b/mm/slab.c
index 6d90a09..82e0a0e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3678,13 +3678,12 @@ static inline void __cache_free(struct
kmem_cache *cachep, void *objp,

 	if (likely(ac->avail < ac->limit)) {
 		STATS_INC_FREEHIT(cachep);
-		ac->entry[ac->avail++] = objp;
-		return;
 	} else {
 		STATS_INC_FREEMISS(cachep);
 		cache_flusharray(cachep, ac);
-		ac->entry[ac->avail++] = objp;
 	}
+
+	ac->entry[ac->avail++] = objp;
 }

 /**
-- 
1.7.4.1

Re: [PATCH] slab: trivial: cleanup: remove unneeded return

[Zhao Jin]

The line starting with ``@@'' in the patch was wrapped by my text
editor when I copied it.
Please see the following corrected one. Sorry for the trouble.

---
 mm/slab.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/slab.c b/mm/slab.c
index 6d90a09..82e0a0e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3678,13 +3678,12 @@ static inline void __cache_free(struct
kmem_cache *cachep, void *objp,

 	if (likely(ac->avail < ac->limit)) {
 		STATS_INC_FREEHIT(cachep);
-		ac->entry[ac->avail++] = objp;
-		return;
 	} else {
 		STATS_INC_FREEMISS(cachep);
 		cache_flusharray(cachep, ac);
-		ac->entry[ac->avail++] = objp;
 	}
+
+	ac->entry[ac->avail++] = objp;
 }

 /**
-- 
1.7.4.1

Re: [PATCH] slab: trivial: cleanup: remove unneeded return

[Zhao Jin]

Terribly sorry. It was gmail who wrapped the line.
Please see this following version. Thanks!

---
  mm/slab.c |    5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/slab.c b/mm/slab.c
index 6d90a09..82e0a0e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3678,13 +3678,12 @@ static inline void __cache_free(struct 
kmem_cache *cachep, void *objp,

      if (likely(ac->avail < ac->limit)) {
          STATS_INC_FREEHIT(cachep);
-        ac->entry[ac->avail++] = objp;
-        return;
      } else {
          STATS_INC_FREEMISS(cachep);
          cache_flusharray(cachep, ac);
-        ac->entry[ac->avail++] = objp;
      }
+
+    ac->entry[ac->avail++] = objp;
  }

  /**
-- 
1.7.4.1

Re: [PATCH] slab: trivial: cleanup: remove unneeded return

[Yong Zhang]

On Fri, Aug 26, 2011 at 02:38:32PM +0800, Zhao Jin wrote:
> Terribly sorry. It was gmail who wrapped the line.
> Please see this following version. Thanks!

You can use git send-email instead or mail client,

Thanks,
Yong
> 
> ---
>  mm/slab.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/mm/slab.c b/mm/slab.c
> index 6d90a09..82e0a0e 100644
> --- a/mm/slab.c
> +++ b/mm/slab.c
> @@ -3678,13 +3678,12 @@ static inline void __cache_free(struct
> kmem_cache *cachep, void *objp,
> 
>      if (likely(ac->avail < ac->limit)) {
>          STATS_INC_FREEHIT(cachep);
> -        ac->entry[ac->avail++] = objp;
> -        return;
>      } else {
>          STATS_INC_FREEMISS(cachep);
>          cache_flusharray(cachep, ac);
> -        ac->entry[ac->avail++] = objp;
>      }
> +
> +    ac->entry[ac->avail++] = objp;
>  }
> 
>  /**
> -- 
> 1.7.4.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

-- 
Only stand for myself

Re: [PATCH] slab: trivial: cleanup: remove unneeded return

[David Rientjes]

On Fri, 26 Aug 2011, Zhao Jin wrote:

> Terribly sorry. It was gmail who wrapped the line.
> Please see this following version. Thanks!
> 

It's still whitespace damaged, please see Documentation/email-clients.txt.  
If it doesn't help, please add to that document with whatever eventually 
works for you, it will help many people in the future!

This probably shouldn't be cc'd to trivial, it's a candidate to go through 
Pekka's slab tree.  And once you get the email client sorted out or Pekka 
decides to do it manually, feel free to add my

	Acked-by: David Rientjes <rientjes@google.com>

even though you forgot the changelog and your own signed-off-by line on 
this one :)

> ---
>  mm/slab.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/mm/slab.c b/mm/slab.c
> index 6d90a09..82e0a0e 100644
> --- a/mm/slab.c
> +++ b/mm/slab.c
> @@ -3678,13 +3678,12 @@ static inline void __cache_free(struct kmem_cache
> *cachep, void *objp,
> 
>      if (likely(ac->avail < ac->limit)) {
>          STATS_INC_FREEHIT(cachep);
> -        ac->entry[ac->avail++] = objp;
> -        return;
>      } else {
>          STATS_INC_FREEMISS(cachep);
>          cache_flusharray(cachep, ac);
> -        ac->entry[ac->avail++] = objp;
>      }
> +
> +    ac->entry[ac->avail++] = objp;
>  }
> 
>  /**

Re: [PATCH] slab: trivial: cleanup: remove unneeded return

[Zhao Jin]

On Fri, 2011-08-26 at 15:39 +0800, Yong Zhang wrote:
> On Fri, Aug 26, 2011 at 02:38:32PM +0800, Zhao Jin wrote:
> > Terribly sorry. It was gmail who wrapped the line.
> > Please see this following version. Thanks!
> 
> You can use git send-email instead or mail client,

Indeed. Thanks a lot for the tip! 

Regards,
zj

Re: [PATCH] slab: trivial: cleanup: remove unneeded return

[Zhao Jin]

On Fri, 2011-08-26 at 02:13 -0700, David Rientjes wrote:
> On Fri, 26 Aug 2011, Zhao Jin wrote:
> 
> > Terribly sorry. It was gmail who wrapped the line.
> > Please see this following version. Thanks!
> > 
> 
> It's still whitespace damaged, please see Documentation/email-clients.txt.  
> If it doesn't help, please add to that document with whatever eventually 
> works for you, it will help many people in the future!
> 
> This probably shouldn't be cc'd to trivial, it's a candidate to go through 
> Pekka's slab tree.  And once you get the email client sorted out or Pekka 
> decides to do it manually, feel free to add my
> 
> 	Acked-by: David Rientjes <rientjes@google.com>
> 
> even though you forgot the changelog and your own signed-off-by line on 
> this one :)

email-client.txt really helps me a lot. I shall resend the patch.
Many thanks for the kind tip!

Regards,
zhj