]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
perf: Reflow to get rid of aux_success label
authorPeter Zijlstra <peterz@infradead.org>
Tue, 12 Aug 2025 10:39:07 +0000 (12:39 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Fri, 15 Aug 2025 11:13:00 +0000 (13:13 +0200)
Mostly re-indent noise needed to get rid of that label.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Link: https://lore.kernel.org/r/20250812104019.362581570@infradead.org
kernel/events/core.c

index 236c60adde88398457a48ceac2704c6c90a957d1..5bbea8127bb6c82ee1aac90982da124a96b7ab83 100644 (file)
@@ -7130,30 +7130,29 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
                if (rb_has_aux(rb)) {
                        atomic_inc(&rb->aux_mmap_count);
                        ret = 0;
-                       goto aux_success;
-               }
 
-               if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
-                       ret = -EPERM;
-                       atomic_dec(&rb->mmap_count);
-                       goto unlock;
-               }
+               } else {
+                       if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
+                               ret = -EPERM;
+                               atomic_dec(&rb->mmap_count);
+                               goto unlock;
+                       }
 
-               WARN_ON(!rb && event->rb);
+                       WARN_ON(!rb && event->rb);
 
-               if (vma->vm_flags & VM_WRITE)
-                       flags |= RING_BUFFER_WRITABLE;
+                       if (vma->vm_flags & VM_WRITE)
+                               flags |= RING_BUFFER_WRITABLE;
 
-               ret = rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages,
-                                  event->attr.aux_watermark, flags);
-               if (ret) {
-                       atomic_dec(&rb->mmap_count);
-                       goto unlock;
-               }
+                       ret = rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages,
+                                          event->attr.aux_watermark, flags);
+                       if (ret) {
+                               atomic_dec(&rb->mmap_count);
+                               goto unlock;
+                       }
 
-               atomic_set(&rb->aux_mmap_count, 1);
-               rb->aux_mmap_locked = extra;
-aux_success:
+                       atomic_set(&rb->aux_mmap_count, 1);
+                       rb->aux_mmap_locked = extra;
+               }
                perf_mmap_account(vma, user_extra, extra);
                atomic_inc(&event->mmap_count);
        }