maple_tree-remove-the-parameter-entry-of-mas_preallocate.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: remove the parameter entry of mas_preallocate
has been removed from the -mm tree. Its filename was
maple_tree-remove-the-parameter-entry-of-mas_preallocate.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Vernon Yang <[email protected]>
Subject: maple_tree: remove the parameter entry of mas_preallocate
Date: Tue, 10 Jan 2023 23:42:11 +0800
The parameter entry of mas_preallocate is not used, so drop it.
Signed-off-by Vernon Yang <[email protected]>
Cc Liam Howlett <[email protected]>
Cc Matthew Wilcox <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/maple_tree.h renamed from include/linux/maple_tree.h~maple_tree-remove-the-parameter-entry-of-mas_preallocate +1 -1
@@ -455,7 +455,7 @@ int mas_store_gfp(struct ma_state *mas,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);
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-remove-the-parameter-entry-of-mas_preallocate +1 -2
@@ -5700,12 +5700,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;
mm/mmap.c renamed from mm/mmap.c~maple_tree-remove-the-parameter-entry-of-mas_preallocate +8 -8
@@ -472,7 +472,7 @@ static int vma_link(struct mm_struct *mmMA_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 *m/* 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 * } } -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);
@@ -1938,7 +1938,7 @@ int expand_upwards(struct vm_area_struct/* 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. */
@@ -2019,7 +2019,7 @@ int expand_downwards(struct vm_area_strureturn -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. */
@@ -2311,7 +2311,7 @@ do_mas_align_munmap(struct ma_state *masmt_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 ;
@@ -2680,7 +2680,7 @@ cannot_expand: 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;
@@ -2953,7 +2953,7 @@ static int do_brk_flags(struct ma_state 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 );
mm/nommu.c renamed from mm/nommu.c~maple_tree-remove-the-parameter-entry-of-mas_preallocate +4 -4
@@ -602,7 +602,7 @@ static int add_vma_to_mm(struct mm_struc {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_ {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 ;
@@ -1091,7 +1091,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 ;
@@ -1369,7 +1369,7 @@ int split_vma(struct mm_struct *mm, struif (!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;
tools/testing/radix-tree/maple.c renamed from tools/testing/radix-tree/maple.c~maple_tree-remove-the-parameter-entry-of-mas_preallocate +16 -16
@@ -35342,7 +35342,7 @@ static noinline void check_prealloc(strufor (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(stru 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(stru 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(struMT_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(strumas_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(strumas_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(strumas_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 );
_
Patches currently in -mm which might be from [email protected] are