Merge branch 'sched/urgent' into sched/core, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -1030,8 +1030,8 @@ static int set_recover_size(struct gfs2_sbd *sdp, struct dlm_slot *slots,
|
||||
|
||||
new_size = old_size + RECOVER_SIZE_INC;
|
||||
|
||||
submit = kzalloc(new_size * sizeof(uint32_t), GFP_NOFS);
|
||||
result = kzalloc(new_size * sizeof(uint32_t), GFP_NOFS);
|
||||
submit = kcalloc(new_size, sizeof(uint32_t), GFP_NOFS);
|
||||
result = kcalloc(new_size, sizeof(uint32_t), GFP_NOFS);
|
||||
if (!submit || !result) {
|
||||
kfree(submit);
|
||||
kfree(result);
|
||||
|
Reference in New Issue
Block a user