linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@kernel.org>
Cc: Joonsoo Kim <js1304@gmail.com>,
	David Rientjes <rientjes@google.com>,
	Glauber Costa <glommer@parallels.com>,
	linux-mm@kvack.org
Subject: C14 [02/14] slub: Use kmem_cache for the kmem_cache structure
Date: Tue, 4 Sep 2012 23:06:14 +0000	[thread overview]
Message-ID: <000001399388ba04-37cd3b88-ef26-40da-9fc7-0460d0a0cb5f-000000@email.amazonses.com> (raw)
In-Reply-To: <20120904230609.691088980@linux.com>

Do not use kmalloc() but kmem_cache_alloc() for the allocation
of the kmem_cache structures in slub.

Reviewed-by: Glauber Costa <glommer@parallels.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
---
 mm/slub.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: linux/mm/slub.c
===================================================================
--- linux.orig/mm/slub.c	2012-09-04 18:00:16.710080309 -0500
+++ linux/mm/slub.c	2012-09-04 18:01:59.767688688 -0500
@@ -213,7 +213,7 @@ static inline int sysfs_slab_alias(struc
 static inline void sysfs_slab_remove(struct kmem_cache *s)
 {
 	kfree(s->name);
-	kfree(s);
+	kmem_cache_free(kmem_cache, s);
 }
 
 #endif
@@ -3969,7 +3969,7 @@ struct kmem_cache *__kmem_cache_create(c
 	if (!n)
 		return NULL;
 
-	s = kmalloc(kmem_size, GFP_KERNEL);
+	s = kmem_cache_alloc(kmem_cache, GFP_KERNEL);
 	if (s) {
 		if (kmem_cache_open(s, n,
 				size, align, flags, ctor)) {
@@ -3986,7 +3986,7 @@ struct kmem_cache *__kmem_cache_create(c
 			list_del(&s->list);
 			kmem_cache_close(s);
 		}
-		kfree(s);
+		kmem_cache_free(kmem_cache, s);
 	}
 	kfree(n);
 	return NULL;
@@ -5224,7 +5224,7 @@ static void kmem_cache_release(struct ko
 	struct kmem_cache *s = to_slab(kobj);
 
 	kfree(s->name);
-	kfree(s);
+	kmem_cache_free(kmem_cache, s);
 }
 
 static const struct sysfs_ops slab_sysfs_ops = {

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2012-09-04 23:06 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20120904230609.691088980@linux.com>
2012-09-04 23:06 ` C14 [01/14] [PATCH 10/28] slub: Add debugging to verify correct cache use on kmem_cache_free() Christoph Lameter
2012-09-04 23:06 ` Christoph Lameter [this message]
2012-09-04 23:18 ` C14 [09/14] Move duping of slab name to slab_common.c Christoph Lameter
2012-09-04 23:18 ` C14 [13/14] Shrink __kmem_cache_create() parameter lists Christoph Lameter
2012-09-04 23:18 ` C14 [05/14] Extract a common function for kmem_cache_destroy Christoph Lameter
2012-09-04 23:38 ` C14 [08/14] Get rid of __kmem_cache_destroy Christoph Lameter
2012-09-04 23:38 ` C14 [14/14] [PATCH 23/28] Move kmem_cache refcounting to common code Christoph Lameter
2012-09-04 23:38 ` C14 [04/14] Move list_add() to slab_common.c Christoph Lameter
2012-09-05  0:18 ` C14 [11/14] Move sysfs_slab_add to common Christoph Lameter
2012-09-05  0:18 ` C14 [07/14] Move freeing of kmem_cache structure to common code Christoph Lameter
2012-09-05  0:18 ` C14 [10/14] Do slab aliasing call from " Christoph Lameter
2012-09-05  0:20 ` C14 [06/14] Always use the name "kmem_cache" for the slab cache with the kmem_cache structure Christoph Lameter
2012-09-05  0:20 ` C14 [03/14] Improve error handling in kmem_cache_create Christoph Lameter
2012-09-05  0:20 ` C14 [12/14] Move kmem_cache allocations into common code Christoph Lameter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=000001399388ba04-37cd3b88-ef26-40da-9fc7-0460d0a0cb5f-000000@email.amazonses.com \
    --to=cl@linux.com \
    --cc=glommer@parallels.com \
    --cc=js1304@gmail.com \
    --cc=linux-mm@kvack.org \
    --cc=penberg@kernel.org \
    --cc=rientjes@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox