From patchwork Tue Jan 10 15:42:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vernon Yang X-Patchwork-Id: 13095310 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C78EBC54EBC for ; Tue, 10 Jan 2023 15:42:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EDA08E0002; Tue, 10 Jan 2023 10:42:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 49D2E8E0001; Tue, 10 Jan 2023 10:42:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 364BD8E0002; Tue, 10 Jan 2023 10:42:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2852F8E0001 for ; Tue, 10 Jan 2023 10:42:22 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E60491604E8 for ; Tue, 10 Jan 2023 15:42:21 +0000 (UTC) X-FDA: 80339306082.22.1EECAF0 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf20.hostedemail.com (Postfix) with ESMTP id 476731C0015 for ; Tue, 10 Jan 2023 15:42:19 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=aYW+aq0y; spf=pass (imf20.hostedemail.com: domain of vernon2gm@gmail.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=vernon2gm@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673365339; a=rsa-sha256; cv=none; b=uEpubjK88+CJZTv5tZxOoNzk1dcBmdN32bvQJJSzZqW2VpwF0iCcR7wVz7H3QnaXWmUtSB EqzTHSVvVN36k6aMc89j9tztVxiZ/T6xbwozIgsvArhV6QUu1N4gmm5s2ZI8qgByzQSm+5 PV3Fj7eX2mZLigzxf2m1FJjKFHdabn4= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=aYW+aq0y; spf=pass (imf20.hostedemail.com: domain of vernon2gm@gmail.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=vernon2gm@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673365339; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=TxJ1orvwaIz49UY3V+bZ+vpeGDcaph8FOsuYxslmG6M=; b=yUJysK3J9OWPecbXO5qWv/cPWcK1VgR8q6b1U4lJa+MS7CrxstRfNYwoCt7L+qz1mwQCOF PNhcE5yoFl/R3lTfl7tnpIw5r5yxpKdfnOdobEsYg2ys61cKdgqBe+nHQwbD/Ei7rBlcpD EE/pC+7dmwXC76YMl36ZXQysR/CXN7Y= Received: by mail-pl1-f175.google.com with SMTP id b17so6077908pld.7 for ; Tue, 10 Jan 2023 07:42:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TxJ1orvwaIz49UY3V+bZ+vpeGDcaph8FOsuYxslmG6M=; b=aYW+aq0ycwUP/MkfEZa4WVXk6q+pe/WbNH20icmeFkCU7s6wAYfifl6BVXgjKyhTJU tXoVrFDaocyCtWUp3jHAdSE6xwWPPi/+Vtd89vo7OWFy1UzKumtt2/5wh/lvVmcsE3Nk dan8tSm8O/KzuBDFEfYbAUBIQE/stKkAJ0/9LT79YlMXb2XM2B+jUWGa8nYkHzaYtL6C JJrN898RS437sCvyUHahiE5cNiWAGZ1xU6Pe5vsU2k7fJTZSHuMmQGfqr6FUwsktCvL6 U2XpshkVH0CTOcZZ0wp2NtqT74TgY9Ty7k7+FqSJbwAjBNgsyHgKdUy8qYcP2tRDq4d/ odjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TxJ1orvwaIz49UY3V+bZ+vpeGDcaph8FOsuYxslmG6M=; b=SVjrbH7hZLnH+zQ3HyP1BU+WAl+N+3Hdr0VdjDt019O346Vua0hkfEoACrO7C7IxgG +SS73ev+13yoxlYgbTKcNqA2EWuoYktc4YHDGcXKskMecdoG1r8DeM1lwQx7PSjvrhHX E/CEpSeRn7zY0FAVcfwFLg3eN52BH3E4xSKlIc7928djBr6Na2YBzrx1hf/c9YLSR/QH D6L6+ZyBKJ/JvYspXK+4fvX0L8k857yWc9dWaB9pmSrFQaWU6lGMO+B71FE5dRDyPns0 hfrf1o9aQ1K7JqsicPS4KV6SQUMgOafRFP0k3pHgYeJ7/oPDjRjw/aMyjxARHFeeWBjr 32sA== X-Gm-Message-State: AFqh2ko3VOgNLiTuXxE8UC2vKMiYJ5YHxckKCFjQIJqYqeN+mTH6Wf+d Mbi5B35lJeTa68qA43yDcz4= X-Google-Smtp-Source: AMrXdXtpMAmNJns+vLc4olq8Qo31U/Mm1zW464AZ1MkOq6Wj9ba++76jyQmXfnSlitXbkqn6VaG1rw== X-Received: by 2002:a17:903:2411:b0:192:d9dd:167d with SMTP id e17-20020a170903241100b00192d9dd167dmr28330586plo.43.1673365338141; Tue, 10 Jan 2023 07:42:18 -0800 (PST) Received: from vernon-pc.. ([49.67.3.29]) by smtp.gmail.com with ESMTPSA id h10-20020a170902680a00b001708c4ebbaesm8102660plk.309.2023.01.10.07.42.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 07:42:17 -0800 (PST) From: Vernon Yang To: Liam.Howlett@oracle.com, akpm@linux-foundation.org, willy@infradead.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Vernon Yang Subject: [PATCH] maple_tree: remove the parameter entry of mas_preallocate Date: Tue, 10 Jan 2023 23:42:11 +0800 Message-Id: <20230110154211.1758562-1-vernon2gm@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 476731C0015 X-Stat-Signature: fo39977xiuk3w3ehcrzxy5xm9xw5fgss X-HE-Tag: 1673365339-881856 X-HE-Meta: U2FsdGVkX18EbVx81scMt2k6cdTuUK5WeufDFn9uRIOlnwEckdOUFLpNwme9bjGoIM4+iMgR1O1vP/Jc6C6KyaMZgkr52KOFj84w/YX13vfLizULzYcgGY+LNB/UknLhNl+DYvxaoEDU/Snyp6zh0t0afZf1335pHdslgkucz6YKvL8prf1Q64v2yYcCwV/jxGrTop4sn9frZxtFVOX4AssAuyqV3hZge2lUWCV+Y0x2/kEjY1tjdb26V/K2WpHzieTZpm0zr3k7DRoD2+pLVewpicW0u7uicQFTjTLor0rCi0ZSVpzs8fb3WBE2v9B7trf/nArXvtUC2hAbNZdy5fdLwZwDeh2UFu1KpniGNjSrxhRZLixK0hAxGkoWF3C7rQ6Lrc7ZgfD4NDE5BTKKE6PzYZMlKWJMjprUFkobEbhJbCugYTNMJmOX5ANlaA6+dUsnqwfD5kbhVj0Gvay7/IwjdLJXxnpgcNBGHqgwDQw7qM8xaMd2saDicXdKi41/5YP/hTuA4xz29LlZonSAYqovVKc6Kascib3psonWoFk35x47BlMZCIrGoWBop9yo+7DST0aMB3G0hIWxGMtpOPhk1VAaQ8SsUZBxjmQDP3NowNXqk3bpDn3uCttarL4OXptuoZ7IpO01LpjAJq0j+yJNboiPUiVWDekgtuYDp3n6o6tDXYK2jXHcXDPsuKUDQvnsFbPTL/UxRHTfcJK+nOdtauGeW7LLe5XdcTx4tp+GdEBUn8bWFYDGuw4z0Bap+DmQZbL5rrRijElhqslh3w0OXLEEacS6nttjATHNnLJPhgLm3MbMmXdvBo7XbYVPcPAKCaPOJ1bzsqQ2aXLYKku/+q9g5bpN+F3lDNCopOO2LW/7PuzhYDLhxz+Ah6GAN9s/P06NUfZk2+dXRZqXWbyMWhV2KBgxfGERQPqVHJkwKi/TvwV+09Ou2PgBh4rbqinB6Seq+lOlkA4SJQU RyIReflG qcbHTlr0RXybQG6J4znS9YhJg+m/EbhCcx6a2YEeJxYvs/2/OYH5bE1nbVrdye8/pTgS1YS4BxJl+DeH3UlgHOTwb4WZDLc5PuL7DA0eVxQMJKVZ961pplOKdTJTZpsnZjh2qcNPaRz9QI3BlpwF76xG1Ml11zU80tCPbAYNO0EDrMH0= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The parameter entry of mas_preallocate is not used, so drop it. Signed-off-by: Vernon Yang Acked-by: Liam R. Howlett --- include/linux/maple_tree.h | 2 +- lib/maple_tree.c | 3 +-- mm/mmap.c | 16 ++++++++-------- mm/nommu.c | 8 ++++---- tools/testing/radix-tree/maple.c | 32 ++++++++++++++++---------------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index e594db58a0f1..a0d43087f27a 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -456,7 +456,7 @@ int mas_store_gfp(struct ma_state *mas, void *entry, gfp_t gfp); void mas_store_prealloc(struct ma_state *mas, void *entry); void *mas_find(struct ma_state *mas, unsigned long max); void *mas_find_rev(struct ma_state *mas, unsigned long min); -int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp); +int mas_preallocate(struct ma_state *mas, gfp_t gfp); bool mas_is_err(struct ma_state *mas); bool mas_nomem(struct ma_state *mas, gfp_t gfp); diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 69be9d3db0c8..96fb4b416697 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5712,12 +5712,11 @@ EXPORT_SYMBOL_GPL(mas_store_prealloc); /** * mas_preallocate() - Preallocate enough nodes for a store operation * @mas: The maple state - * @entry: The entry that will be stored * @gfp: The GFP_FLAGS to use for allocations. * * Return: 0 on success, -ENOMEM if memory could not be allocated. */ -int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp) +int mas_preallocate(struct ma_state *mas, gfp_t gfp) { int ret; diff --git a/mm/mmap.c b/mm/mmap.c index e06f9ae34ff8..64bdd38e8d8e 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -472,7 +472,7 @@ static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma) MA_STATE(mas, &mm->mm_mt, 0, 0); struct address_space *mapping = NULL; - if (mas_preallocate(&mas, vma, GFP_KERNEL)) + if (mas_preallocate(&mas, GFP_KERNEL)) return -ENOMEM; if (vma->vm_file) { @@ -538,7 +538,7 @@ inline int vma_expand(struct ma_state *mas, struct vm_area_struct *vma, /* Only handles expanding */ VM_BUG_ON(vma->vm_start < start || vma->vm_end > end); - if (mas_preallocate(mas, vma, GFP_KERNEL)) + if (mas_preallocate(mas, GFP_KERNEL)) goto nomem; vma_adjust_trans_huge(vma, start, end, 0); @@ -712,7 +712,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, } } - if (mas_preallocate(&mas, vma, GFP_KERNEL)) + if (mas_preallocate(&mas, GFP_KERNEL)) return -ENOMEM; vma_adjust_trans_huge(orig_vma, start, end, adjust_next); @@ -1934,7 +1934,7 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) /* Check that both stack segments have the same anon_vma? */ } - if (mas_preallocate(&mas, vma, GFP_KERNEL)) + if (mas_preallocate(&mas, GFP_KERNEL)) return -ENOMEM; /* We must make sure the anon_vma is allocated. */ @@ -2015,7 +2015,7 @@ int expand_downwards(struct vm_area_struct *vma, unsigned long address) return -ENOMEM; } - if (mas_preallocate(&mas, vma, GFP_KERNEL)) + if (mas_preallocate(&mas, GFP_KERNEL)) return -ENOMEM; /* We must make sure the anon_vma is allocated. */ @@ -2307,7 +2307,7 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma, mt_init_flags(&mt_detach, MT_FLAGS_LOCK_EXTERN); mt_set_external_lock(&mt_detach, &mm->mmap_lock); - if (mas_preallocate(mas, vma, GFP_KERNEL)) + if (mas_preallocate(mas, GFP_KERNEL)) return -ENOMEM; mas->last = end - 1; @@ -2676,7 +2676,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, goto free_vma; } - if (mas_preallocate(&mas, vma, GFP_KERNEL)) { + if (mas_preallocate(&mas, GFP_KERNEL)) { error = -ENOMEM; if (file) goto close_and_free_vma; @@ -2949,7 +2949,7 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma, can_vma_merge_after(vma, flags, NULL, NULL, addr >> PAGE_SHIFT, NULL_VM_UFFD_CTX, NULL)) { mas_set_range(mas, vma->vm_start, addr + len - 1); - if (mas_preallocate(mas, vma, GFP_KERNEL)) + if (mas_preallocate(mas, GFP_KERNEL)) goto unacct_fail; vma_adjust_trans_huge(vma, vma->vm_start, addr + len, 0); diff --git a/mm/nommu.c b/mm/nommu.c index 214c70e1d059..0befa4060aea 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -602,7 +602,7 @@ static int add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma) { MA_STATE(mas, &mm->mm_mt, vma->vm_start, vma->vm_end); - if (mas_preallocate(&mas, vma, GFP_KERNEL)) { + if (mas_preallocate(&mas, GFP_KERNEL)) { pr_warn("Allocation of vma tree for process %d failed\n", current->pid); return -ENOMEM; @@ -633,7 +633,7 @@ static int delete_vma_from_mm(struct vm_area_struct *vma) { MA_STATE(mas, &vma->vm_mm->mm_mt, 0, 0); - if (mas_preallocate(&mas, vma, GFP_KERNEL)) { + if (mas_preallocate(&mas, GFP_KERNEL)) { pr_warn("Allocation of vma tree for process %d failed\n", current->pid); return -ENOMEM; @@ -1081,7 +1081,7 @@ unsigned long do_mmap(struct file *file, if (!vma) goto error_getting_vma; - if (mas_preallocate(&mas, vma, GFP_KERNEL)) + if (mas_preallocate(&mas, GFP_KERNEL)) goto error_maple_preallocate; region->vm_usage = 1; @@ -1358,7 +1358,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, if (!new) goto err_vma_dup; - if (mas_preallocate(&mas, vma, GFP_KERNEL)) { + if (mas_preallocate(&mas, GFP_KERNEL)) { pr_warn("Allocation of vma tree for process %d failed\n", current->pid); goto err_mas_preallocate; diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c index 81fa7ec2e66a..8170ef39d8c4 100644 --- a/tools/testing/radix-tree/maple.c +++ b/tools/testing/radix-tree/maple.c @@ -35342,7 +35342,7 @@ static noinline void check_prealloc(struct maple_tree *mt) for (i = 0; i <= max; i++) mtree_test_store_range(mt, i * 10, i * 10 + 5, &i); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated == 0); @@ -35351,18 +35351,18 @@ static noinline void check_prealloc(struct maple_tree *mt) allocated = mas_allocated(&mas); MT_BUG_ON(mt, allocated != 0); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated == 0); MT_BUG_ON(mt, allocated != 1 + height * 3); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); mas_destroy(&mas); allocated = mas_allocated(&mas); MT_BUG_ON(mt, allocated != 0); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated == 0); @@ -35370,25 +35370,25 @@ static noinline void check_prealloc(struct maple_tree *mt) mn = mas_pop_node(&mas); MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1); ma_free_rcu(mn); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); mas_destroy(&mas); allocated = mas_allocated(&mas); MT_BUG_ON(mt, allocated != 0); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated == 0); MT_BUG_ON(mt, allocated != 1 + height * 3); mn = mas_pop_node(&mas); MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); mas_destroy(&mas); allocated = mas_allocated(&mas); MT_BUG_ON(mt, allocated != 0); ma_free_rcu(mn); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated == 0); @@ -35397,12 +35397,12 @@ static noinline void check_prealloc(struct maple_tree *mt) MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1); mas_push_node(&mas, mn); MT_BUG_ON(mt, mas_allocated(&mas) != allocated); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); mas_destroy(&mas); allocated = mas_allocated(&mas); MT_BUG_ON(mt, allocated != 0); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated == 0); @@ -35410,21 +35410,21 @@ static noinline void check_prealloc(struct maple_tree *mt) mas_store_prealloc(&mas, ptr); MT_BUG_ON(mt, mas_allocated(&mas) != 0); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated == 0); MT_BUG_ON(mt, allocated != 1 + height * 3); mas_store_prealloc(&mas, ptr); MT_BUG_ON(mt, mas_allocated(&mas) != 0); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated == 0); MT_BUG_ON(mt, allocated != 1 + height * 3); mas_store_prealloc(&mas, ptr); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated == 0); @@ -35432,14 +35432,14 @@ static noinline void check_prealloc(struct maple_tree *mt) mas_store_prealloc(&mas, ptr); MT_BUG_ON(mt, mas_allocated(&mas) != 0); mt_set_non_kernel(1); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL & GFP_NOWAIT) == 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL & GFP_NOWAIT) == 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated != 0); mas_destroy(&mas); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated == 0); @@ -35447,7 +35447,7 @@ static noinline void check_prealloc(struct maple_tree *mt) mas_store_prealloc(&mas, ptr); MT_BUG_ON(mt, mas_allocated(&mas) != 0); mt_set_non_kernel(1); - MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL & GFP_NOWAIT) == 0); + MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL & GFP_NOWAIT) == 0); allocated = mas_allocated(&mas); height = mas_mt_height(&mas); MT_BUG_ON(mt, allocated != 0);