GFS2: replace kmalloc - __vmalloc / memset 0
Use kzalloc and __vmalloc __GFP_ZERO for clean sd_quota_bitmap allocation. Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
b1ab1e44b4
commit
fcf10d38af
1 changed files with 3 additions and 4 deletions
|
@ -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 = DIV_ROUND_UP(sdp->sd_quota_slots, 8 * sizeof(unsigned long));
|
||||||
bm_size *= sizeof(unsigned long);
|
bm_size *= sizeof(unsigned long);
|
||||||
error = -ENOMEM;
|
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)
|
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)
|
if (!sdp->sd_quota_bitmap)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
memset(sdp->sd_quota_bitmap, 0, bm_size);
|
|
||||||
|
|
||||||
for (x = 0; x < blocks; x++) {
|
for (x = 0; x < blocks; x++) {
|
||||||
struct buffer_head *bh;
|
struct buffer_head *bh;
|
||||||
const struct gfs2_quota_change *qc;
|
const struct gfs2_quota_change *qc;
|
||||||
|
|
Loading…
Reference in a new issue