From: Ezequiel Garcia <elezegarcia@gmail.com>
To: linux-mm@kvack.org
Cc: Ezequiel Garcia <elezegarcia@gmail.com>,
Pekka Enberg <penberg@kernel.org>,
Christoph Lameter <cl@linux.com>
Subject: [PATCH 4/5] mm, slob: Use only 'ret' variable for both slob object and returned pointer
Date: Wed, 5 Sep 2012 19:48:42 -0300 [thread overview]
Message-ID: <1346885323-15689-4-git-send-email-elezegarcia@gmail.com> (raw)
In-Reply-To: <1346885323-15689-1-git-send-email-elezegarcia@gmail.com>
There's no need to use two variables, 'ret' and 'm'.
This is a minor cleanup patch, but it will allow next patch to clean
the way tracing is done.
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Christoph Lameter <cl@linux.com>
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
---
mm/slob.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/mm/slob.c b/mm/slob.c
index 083959a..3f4dc9a 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -427,7 +427,6 @@ out:
static __always_inline void *
__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
{
- unsigned int *m;
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
void *ret;
@@ -439,12 +438,12 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
if (!size)
return ZERO_SIZE_PTR;
- m = slob_alloc(size + align, gfp, align, node);
+ ret = slob_alloc(size + align, gfp, align, node);
- if (!m)
+ if (!ret)
return NULL;
- *m = size;
- ret = (void *)m + align;
+ *(unsigned int *)ret = size;
+ ret += align;
trace_kmalloc_node(caller, ret,
size, size + align, gfp, node);
--
1.7.8.6
--
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>
next prev parent reply other threads:[~2012-09-05 22:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-05 22:48 [PATCH 1/5] mm, slab: Remove silly function slab_buffer_size() Ezequiel Garcia
2012-09-05 22:48 ` [PATCH 2/5] mm, slob: Add support for kmalloc_track_caller() Ezequiel Garcia
2012-09-06 0:57 ` David Rientjes
2012-09-06 1:10 ` Ezequiel Garcia
2012-09-06 7:17 ` Pekka Enberg
2012-09-05 22:48 ` [PATCH 3/5] mm, util: Do strndup_user allocation directly, instead of through memdup_user Ezequiel Garcia
2012-09-06 0:59 ` David Rientjes
2012-09-06 1:06 ` Ezequiel Garcia
2012-09-06 19:27 ` JoonSoo Kim
2012-09-07 0:00 ` Ezequiel Garcia
2012-09-07 21:12 ` JoonSoo Kim
2012-09-05 22:48 ` Ezequiel Garcia [this message]
2012-09-06 14:18 ` [PATCH 4/5] mm, slob: Use only 'ret' variable for both slob object and returned pointer Christoph Lameter
2012-09-06 15:04 ` Ezequiel Garcia
2012-09-05 22:48 ` [PATCH 5/5] mm, slob: Trace allocation failures consistently Ezequiel Garcia
2012-09-06 19:09 ` JoonSoo Kim
2012-09-07 0:03 ` Ezequiel Garcia
2012-09-07 21:23 ` JoonSoo Kim
2012-09-08 13:26 ` Ezequiel Garcia
2012-09-07 21:50 ` JoonSoo Kim
2012-09-07 22:00 ` JoonSoo Kim
2012-09-06 0:54 ` [PATCH 1/5] mm, slab: Remove silly function slab_buffer_size() David Rientjes
2012-09-06 1:07 ` Ezequiel Garcia
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=1346885323-15689-4-git-send-email-elezegarcia@gmail.com \
--to=elezegarcia@gmail.com \
--cc=cl@linux.com \
--cc=linux-mm@kvack.org \
--cc=penberg@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).