mm-vma-de-duplicate-__vma_enter_locked-error-path.patch removed from -mm tree
The quilt patch titled
Subject: mm/vma: de-duplicate __vma_enter_locked() error path
has been removed from the -mm tree. Its filename was
mm-vma-de-duplicate-__vma_enter_locked-error-path.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: Lorenzo Stoakes <[email protected]>
Subject: mm/vma: de-duplicate __vma_enter_locked() error path
Date: Fri, 23 Jan 2026 20:12:15 +0000
We're doing precisely the same thing that __vma_exit_locked() does, so de-duplicate this code and keep the refcount primitive in one place.
No functional change intended.
---
mm/mmap_lock.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
mm/mmap_lock.c renamed from mm/mmap_lock.c~mm-vma-de-duplicate-__vma_enter_locked-error-path +12 -9
@@ -45,6 +45,14 @@ EXPORT_SYMBOL(__mmap_lock_do_trace_relea#ifdef CONFIG_MMU #ifdef CONFIG_PER_VMA_LOCK + +static inline void __vma_exit_locked (struct vm_area_struct *vma,bool *detached) +{ + *detached =refcount_sub_and_test (VM_REFCNT_EXCLUDE_READERS_FLAG , + &vma->vm_refcnt); +__vma_lockdep_release_exclusive (vma); +} +/* * __vma_enter_locked() returns 0 immediately if the vma is not * attached, otherwise it waits for any current readers to finish and
@@ -77,7 +85,10 @@ static inline int __vma_enter_locked(strrefcount_read (&vma->vm_refcnt) == tgt_refcnt, state);if (err) { -if (refcount_sub_and_test (VM_REFCNT_EXCLUDE_READERS_FLAG , &vma->vm_refcnt)) { +bool detached; + +__vma_exit_locked (vma, &detached); +if (detached) {/* * The wait failed, but the last reader went away * as well. Tell the caller the VMA is detached.
@@ -85,7 +96,6 @@ static inline int __vma_enter_locked(strWARN_ON_ONCE (!detaching); err =0 ; } -__vma_lockdep_release_exclusive (vma);return err; }__vma_lockdep_stat_mark_acquired (vma);
@@ -93,13 +103,6 @@ static inline int __vma_enter_locked(strreturn 1 ; } -static inline void __vma_exit_locked (struct vm_area_struct *vma,bool *detached) -{ - *detached =refcount_sub_and_test (VM_REFCNT_EXCLUDE_READERS_FLAG , - &vma->vm_refcnt); -__vma_lockdep_release_exclusive (vma); -} -int __vma_start_write (struct vm_area_struct *vma,unsigned int mm_lock_seq,int state) {
_
Patches currently in -mm which might be from [email protected] are
mm-vma-remove-__private-sparse-decoration-from-vma_flags_t.patch mm-rename-vma_flag_test-set_atomic-to-vma_test-set_atomic_flag.patch mm-add-mk_vma_flags-bitmap-flag-macro-helper.patch tools-bitmap-add-missing-bitmap_.patch mm-add-basic-vma-flag-operation-helper-functions.patch mm-update-hugetlbfs-to-use-vma-flags-on-mmap_prepare.patch mm-update-secretmem-to-use-vma-flags-on-mmap_prepare.patch mm-update-secretmem-to-use-vma-flags-on-mmap_prepare-fix.patch mm-update-shmem__file_-functions-to-use-vma_flags_t.patch mm-update-all-remaining-mmap_prepare-users-to-use-vma_flags_t.patch mm-make-vm_area_desc-utilise-vma_flags_t-only.patch tools-testing-vma-separate-vma-userland-tests-into-separate-files.patch tools-testing-vma-separate-out-vma_internalh-into-logical-headers.patch tools-testing-vma-separate-out-vma_internalh-into-logical-headers-fix.patch tools-testing-vma-add-vma-userland-tests-for-vma-flag-functions.patch