afs: Provide a splice-read wrapper

[linux-block.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 5522130ae6065d256c8cd80616378137c417132f..13678edaa22c9005437a53965d6feccd457c5769 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -960,17 +960,17 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm,
                merge_next = true;
        }
 
+       /* Verify some invariant that must be enforced by the caller. */
+       VM_WARN_ON(prev && addr <= prev->vm_start);
+       VM_WARN_ON(curr && (addr != curr->vm_start || end > curr->vm_end));
+       VM_WARN_ON(addr >= end);
+
        if (!merge_prev && !merge_next)
                return NULL; /* Not mergeable. */
 
        res = vma = prev;
        remove = remove2 = adjust = NULL;
 
-       /* Verify some invariant that must be enforced by the caller. */
-       VM_WARN_ON(prev && addr <= prev->vm_start);
-       VM_WARN_ON(curr && (addr != curr->vm_start || end > curr->vm_end));
-       VM_WARN_ON(addr >= end);
-
        /* Can we merge both the predecessor and the successor? */
        if (merge_prev && merge_next &&
            is_mergeable_anon_vma(prev->anon_vma, next->anon_vma, NULL)) {