Use directly kmalloc() and kfree() in init/initramfs.c
PATCH 1/1 Use directly kmalloc() and kfree() in init/initramfs.c
Instead of using the malloc() and free() wrappers needed by the lib/inflate.c code for allocations, simply use kmalloc() and kfree() in the initramfs code. This is needed for a further lib/inflate.c-related cleanup patch that will remove the malloc() and free() functions.
Based of work done by Matt Mackall <[email protected]>.
--- init/initramfs.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
init/initramfs.c +10 -10
@@ -57,7 +57,7 @@continue ;return (*p)->name; } - q = (struct hash *)malloc (sizeof (struct hash )); + q = (struct hash *)kmalloc (sizeof (struct hash ),GFP_KERNEL );if (!q)panic ("can't allocate link hash entry" ); q->major = major;
@@ -77,7 +77,7 @@while (*p) { q = *p; *p = q->next; -free (q); +kfree (q); } } }
@@ -445,10 +445,10 @@ {int written; dry_run = check_only; - header_buf =malloc (110 ); - symlink_buf =malloc (PATH_MAX +N_ALIGN (PATH_MAX ) +1 ); - name_buf =malloc (N_ALIGN (PATH_MAX )); - window =malloc (WSIZE ); + header_buf =kmalloc (110 ,GFP_KERNEL ); + symlink_buf =kmalloc (PATH_MAX +N_ALIGN (PATH_MAX ) +1 ,GFP_KERNEL ); + name_buf =kmalloc (N_ALIGN (PATH_MAX ),GFP_KERNEL ); + window =kmalloc (WSIZE ,GFP_KERNEL );if (!window || !header_buf || !symlink_buf || !name_buf)panic ("can't allocate buffers" ); state = Start;
@@ -484,10 +484,10 @@ buf += inptr; len -= inptr; } -free (window); -free (name_buf); -free (symlink_buf); -free (header_buf); +kfree (window); +kfree (name_buf); +kfree (symlink_buf); +kfree (header_buf);return message; }
Signature · 4 lines
Thomas Petazzoni, Free Electrons Free Embedded Linux Training Materials on http://free-electrons.com/training (More than 1500 pages!)
init/initramfs.c line 60
Quoted 7 lines · Thomas Petazzoni
+++
linux/init/initramfs.cinit/initramfs.c +1
-1@@ -57,7 +57,7 @@continue ;return (*p)->name; } - q = (struct hash *)malloc (sizeof (struct hash )); + q = (struct hash *)kmalloc (sizeof (struct hash ),GFP_KERNEL );
Remove the cast while you are at it, thanks :)
Hi,
Quoted 1 line · Jan Engelhardt
Remove the cast while you are at it, thanks :)
Right, thanks for the comment. Here is an updated patch. Who will pick it up ? There doesn't seem to be a maintainer for the initramfs code (not in MAINTAINERS, not in the init/initramfs.c file itself).
Thanks,
Thomas
---
Instead of using the malloc() and free() wrappers needed by the lib/inflate.c code for allocations, simply use kmalloc() and kfree() in the initramfs code. This is needed for a further lib/inflate.c-related cleanup patch that will remove the malloc() and free() functions.
Take that opportunity to remove the useless kmalloc() return value cast.
Based of work done by Matt Mackall <[email protected]>.
--- init/initramfs.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
init/initramfs.c +10 -10
@@ -57,7 +57,7 @@continue ;return (*p)->name; } - q = (struct hash *)malloc (sizeof (struct hash )); + q =kmalloc (sizeof (struct hash ),GFP_KERNEL );if (!q)panic ("can't allocate link hash entry" ); q->major = major;
@@ -77,7 +77,7 @@while (*p) { q = *p; *p = q->next; -free (q); +kfree (q); } } }
@@ -445,10 +445,10 @@ {int written; dry_run = check_only; - header_buf =malloc (110 ); - symlink_buf =malloc (PATH_MAX +N_ALIGN (PATH_MAX ) +1 ); - name_buf =malloc (N_ALIGN (PATH_MAX )); - window =malloc (WSIZE ); + header_buf =kmalloc (110 ,GFP_KERNEL ); + symlink_buf =kmalloc (PATH_MAX +N_ALIGN (PATH_MAX ) +1 ,GFP_KERNEL ); + name_buf =kmalloc (N_ALIGN (PATH_MAX ),GFP_KERNEL ); + window =kmalloc (WSIZE ,GFP_KERNEL );if (!window || !header_buf || !symlink_buf || !name_buf)panic ("can't allocate buffers" ); state = Start;
@@ -484,10 +484,10 @@ buf += inptr; len -= inptr; } -free (window); -free (name_buf); -free (symlink_buf); -free (header_buf); +kfree (window); +kfree (name_buf); +kfree (symlink_buf); +kfree (header_buf);return message; }
Signature · 4 lines
Thomas Petazzoni, Free Electrons Free Embedded Linux Training Materials on http://free-electrons.com/training (More than 1500 pages!)
Quoted 6 lines · Thomas Petazzoni
Quoted 2 lines
Remove the cast while you are at it, thanks :)
Right, thanks for the comment. Here is an updated patch. Who will pick it up ? There doesn't seem to be a maintainer for the initramfs code (not in
MAINTAINERS, not in theinit/initramfs.cfile itself).
Anyone you can get to push the actual changeset; many won't feel responsible :) so the path is through ->akpm->linus here.
BTW, if you changed free to kfree, did the free macro/whatever get removed or is it still used?
Quoted 2 lines · Jan Engelhardt
Anyone you can get to push the actual changeset; many won't feel responsible :) so the path is through ->akpm->linus here.
Ok, so as Andrew is in Cc:, I suppose he will pick the patch :-)
Quoted 2 lines
BTW, if you changed free to kfree, did the free macro/whatever get removed or is it still used?
After this patch, they are still used by the lib/inflate.c code. But if you look at the patch called "inflate: refactor inflate malloc code" that I sent to the LKML this morning, you'll see that it removes the malloc() and free() wrappers (and does some more clean-up).
Sincerly,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Free Embedded Linux Training Materials on http://free-electrons.com/training (More than 1500 pages!)