tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

perf: Remove redundant aux_unlock label

unlock and aux_unlock are now identical, remove the aux_unlock one.

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

Peter Zijlstra 41b80e1d 4118994b

+8 -9
+8 -9
kernel/events/core.c
··· 7098 7098 7099 7099 rb = event->rb; 7100 7100 if (!rb) 7101 - goto aux_unlock; 7101 + goto unlock; 7102 7102 7103 7103 aux_mutex = &rb->aux_mutex; 7104 7104 mutex_lock(aux_mutex); ··· 7107 7107 aux_size = READ_ONCE(rb->user_page->aux_size); 7108 7108 7109 7109 if (aux_offset < perf_data_size(rb) + PAGE_SIZE) 7110 - goto aux_unlock; 7110 + goto unlock; 7111 7111 7112 7112 if (aux_offset != vma->vm_pgoff << PAGE_SHIFT) 7113 - goto aux_unlock; 7113 + goto unlock; 7114 7114 7115 7115 /* already mapped with a different offset */ 7116 7116 if (rb_has_aux(rb) && rb->aux_pgoff != vma->vm_pgoff) 7117 - goto aux_unlock; 7117 + goto unlock; 7118 7118 7119 7119 if (aux_size != nr_pages * PAGE_SIZE) 7120 - goto aux_unlock; 7120 + goto unlock; 7121 7121 7122 7122 /* already mapped with a different size */ 7123 7123 if (rb_has_aux(rb) && rb->aux_nr_pages != nr_pages) 7124 - goto aux_unlock; 7124 + goto unlock; 7125 7125 7126 7126 if (!is_power_of_2(nr_pages)) 7127 - goto aux_unlock; 7127 + goto unlock; 7128 7128 7129 7129 if (!atomic_inc_not_zero(&rb->mmap_count)) 7130 - goto aux_unlock; 7130 + goto unlock; 7131 7131 7132 7132 if (rb_has_aux(rb)) { 7133 7133 atomic_inc(&rb->aux_mmap_count); ··· 7161 7161 } 7162 7162 7163 7163 unlock: 7164 - aux_unlock: 7165 7164 if (aux_mutex) 7166 7165 mutex_unlock(aux_mutex); 7167 7166 mutex_unlock(&event->mmap_mutex);