2012-05-08 05:32:22

by Pekka Enberg

Subject: Re: [PATCH] slub: fix incorrect return type of get_any_partial()

On Fri, 27 Jan 2012, Joonsoo Kim wrote:

> Commit 497b66f2ecc97844493e6a147fd5a7e73f73f408 ('slub: return object pointer
> from get_partial() / new_slab().') changed return type of some functions.
> This updates missing part.
>
> Signed-off-by: Joonsoo Kim <[email protected]>
>
> diff --git a/mm/slub.c b/mm/slub.c
> index ffe13fd..18bf13e 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -1579,7 +1579,7 @@ static void *get_partial_node(struct kmem_cache *s,
> /*
> * Get a page from somewhere. Search in increasing NUMA distances.
> */
> -static struct page *get_any_partial(struct kmem_cache *s, gfp_t flags,
> +static void *get_any_partial(struct kmem_cache *s, gfp_t flags,
> struct kmem_cache_cpu *c)
> {
> #ifdef CONFIG_NUMA
> --
> 1.7.0.4

Applied, thanks!

2012-05-08 14:13:13

by Christoph Lameter (Ampere)

Subject: Re: [PATCH] slub: fix incorrect return type of get_any_partial()

On Tue, 8 May 2012, Pekka Enberg wrote:

> On Fri, 27 Jan 2012, Joonsoo Kim wrote:
>
> > Commit 497b66f2ecc97844493e6a147fd5a7e73f73f408 ('slub: return object pointer
> > from get_partial() / new_slab().') changed return type of some functions.
> > This updates missing part.
> >
> > Signed-off-by: Joonsoo Kim <[email protected]>
> >
> > diff --git a/mm/slub.c b/mm/slub.c
> > index ffe13fd..18bf13e 100644
> > --- a/mm/slub.c
> > +++ b/mm/slub.c
> > @@ -1579,7 +1579,7 @@ static void *get_partial_node(struct kmem_cache *s,
> > /*
> > * Get a page from somewhere. Search in increasing NUMA distances.
> > */
> > -static struct page *get_any_partial(struct kmem_cache *s, gfp_t flags,
> > +static void *get_any_partial(struct kmem_cache *s, gfp_t flags,
> > struct kmem_cache_cpu *c)
> > {
> > #ifdef CONFIG_NUMA
> > --
> > 1.7.0.4
>
> Applied, thanks!

Could we also fix the comment at the same time?

2012-05-10 15:25:21

by Joonsoo Kim

Subject: [PATCH] slub: fix incorrect return type of get_any_partial()

Commit 497b66f2ecc97844493e6a147fd5a7e73f73f408 ('slub: return object pointer
from get_partial() / new_slab().') changed return type of some functions.
This updates missing part.

In addition, fix some comments

Signed-off-by: Joonsoo Kim <[email protected]>

diff --git a/mm/slub.c b/mm/slub.c
index ffe13fd..23d66aa 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1577,9 +1577,9 @@ static void *get_partial_node(struct kmem_cache *s,
}

/*
- * Get a page from somewhere. Search in increasing NUMA distances.
+ * Get a partial slab from somewhere. Search in increasing NUMA distances.
*/
-static struct page *get_any_partial(struct kmem_cache *s, gfp_t flags,
+static void *get_any_partial(struct kmem_cache *s, gfp_t flags,
struct kmem_cache_cpu *c)
{
#ifdef CONFIG_NUMA
@@ -1643,7 +1643,7 @@ static struct page *get_any_partial(struct kmem_cache *s, gfp_t flags,
}

/*
- * Get a partial page, lock it and return it.
+ * Get a partial slab, lock it and return it.
*/
static void *get_partial(struct kmem_cache *s, gfp_t flags, int node,
struct kmem_cache_cpu *c)
--
1.7.9.5

2012-05-10 15:27:55

by Christoph Lameter (Ampere)

Subject: Re: [PATCH] slub: fix incorrect return type of get_any_partial()

On Fri, 11 May 2012, Joonsoo Kim wrote:

> Commit 497b66f2ecc97844493e6a147fd5a7e73f73f408 ('slub: return object pointer
> from get_partial() / new_slab().') changed return type of some functions.
> This updates missing part.

Acked-by: Christoph Lameter <[email protected]>