The Linux Kernel Mailing List
 help / color / mirror / Atom feed
* [PATCH 1/1] fs/gfs2/quota.c: replace kmalloc - __vmalloc / memset 0
@ 2014-02-26 18:07 Fabian Frederick
  2014-02-27 12:27 ` Steven Whitehouse
  0 siblings, 1 reply; 2+ messages in thread
From: Fabian Frederick @ 2014-02-26 18:07 UTC (permalink / raw)
  To: linux-kernel; +Cc: swhiteho, akpm

Use kzalloc and __vmalloc __GFP_ZERO for clean sd_quota_bitmap allocation.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 fs/gfs2/quota.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 8bec0e31..1ee4b88 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1242,14 +1242,13 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)
 	bm_size = DIV_ROUND_UP(sdp->sd_quota_slots, 8 * sizeof(unsigned long));
 	bm_size *= sizeof(unsigned long);
 	error = -ENOMEM;
-	sdp->sd_quota_bitmap = kmalloc(bm_size, GFP_NOFS|__GFP_NOWARN);
+	sdp->sd_quota_bitmap = kzalloc(bm_size, GFP_NOFS | __GFP_NOWARN);
 	if (sdp->sd_quota_bitmap == NULL)
-		sdp->sd_quota_bitmap = __vmalloc(bm_size, GFP_NOFS, PAGE_KERNEL);
+		sdp->sd_quota_bitmap = __vmalloc(bm_size, GFP_NOFS |
+						 __GFP_ZERO, PAGE_KERNEL);
 	if (!sdp->sd_quota_bitmap)
 		return error;
 
-	memset(sdp->sd_quota_bitmap, 0, bm_size);
-
 	for (x = 0; x < blocks; x++) {
 		struct buffer_head *bh;
 		const struct gfs2_quota_change *qc;
-- 
1.8.1.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] fs/gfs2/quota.c: replace kmalloc - __vmalloc / memset 0
  2014-02-26 18:07 [PATCH 1/1] fs/gfs2/quota.c: replace kmalloc - __vmalloc / memset 0 Fabian Frederick
@ 2014-02-27 12:27 ` Steven Whitehouse
  0 siblings, 0 replies; 2+ messages in thread
From: Steven Whitehouse @ 2014-02-27 12:27 UTC (permalink / raw)
  To: Fabian Frederick; +Cc: linux-kernel, akpm

Hi,

On Wed, 2014-02-26 at 19:07 +0100, Fabian Frederick wrote:
> Use kzalloc and __vmalloc __GFP_ZERO for clean sd_quota_bitmap allocation.
> 
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
> ---
>  fs/gfs2/quota.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
Thanks for the patch. I've added it to the GFS2 -nmw tree,

Steve.

> diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
> index 8bec0e31..1ee4b88 100644
> --- a/fs/gfs2/quota.c
> +++ b/fs/gfs2/quota.c
> @@ -1242,14 +1242,13 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)
>  	bm_size = DIV_ROUND_UP(sdp->sd_quota_slots, 8 * sizeof(unsigned long));
>  	bm_size *= sizeof(unsigned long);
>  	error = -ENOMEM;
> -	sdp->sd_quota_bitmap = kmalloc(bm_size, GFP_NOFS|__GFP_NOWARN);
> +	sdp->sd_quota_bitmap = kzalloc(bm_size, GFP_NOFS | __GFP_NOWARN);
>  	if (sdp->sd_quota_bitmap == NULL)
> -		sdp->sd_quota_bitmap = __vmalloc(bm_size, GFP_NOFS, PAGE_KERNEL);
> +		sdp->sd_quota_bitmap = __vmalloc(bm_size, GFP_NOFS |
> +						 __GFP_ZERO, PAGE_KERNEL);
>  	if (!sdp->sd_quota_bitmap)
>  		return error;
>  
> -	memset(sdp->sd_quota_bitmap, 0, bm_size);
> -
>  	for (x = 0; x < blocks; x++) {
>  		struct buffer_head *bh;
>  		const struct gfs2_quota_change *qc;



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-02-27 12:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-26 18:07 [PATCH 1/1] fs/gfs2/quota.c: replace kmalloc - __vmalloc / memset 0 Fabian Frederick
2014-02-27 12:27 ` Steven Whitehouse

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox