Skip to content

Commit b67bfe0

Browse files
sashalevintorvalds
sashalevin
authored and
torvalds
committed
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived list_for_each_entry(pos, head, member) The hlist ones were greedy and wanted an extra parameter: hlist_for_each_entry(tpos, pos, head, member) Why did they need an extra pos parameter? I'm not quite sure. Not only they don't really need it, it also prevents the iterator from looking exactly like the list iterator, which is unfortunate. Besides the semantic patch, there was some manual work required: - Fix up the actual hlist iterators in linux/list.h - Fix up the declaration of other iterators based on the hlist ones. - A very small amount of places were using the 'node' parameter, this was modified to use 'obj->member' instead. - Coccinelle didn't handle the hlist_for_each_entry_safe iterator properly, so those had to be fixed up manually. The semantic patch which is mostly the work of Peter Senna Tschudin is here: @@ iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host; type T; expression a,c,d,e; identifier b; statement S; @@ -T b; <+... when != b ( hlist_for_each_entry(a, - b, c, d) S | hlist_for_each_entry_continue(a, - b, c) S | hlist_for_each_entry_from(a, - b, c) S | hlist_for_each_entry_rcu(a, - b, c, d) S | hlist_for_each_entry_rcu_bh(a, - b, c, d) S | hlist_for_each_entry_continue_rcu_bh(a, - b, c) S | for_each_busy_worker(a, c, - b, d) S | ax25_uid_for_each(a, - b, c) S | ax25_for_each(a, - b, c) S | inet_bind_bucket_for_each(a, - b, c) S | sctp_for_each_hentry(a, - b, c) S | sk_for_each(a, - b, c) S | sk_for_each_rcu(a, - b, c) S | sk_for_each_from -(a, b) +(a) S + sk_for_each_from(a) S | sk_for_each_safe(a, - b, c, d) S | sk_for_each_bound(a, - b, c) S | hlist_for_each_entry_safe(a, - b, c, d, e) S | hlist_for_each_entry_continue_rcu(a, - b, c) S | nr_neigh_for_each(a, - b, c) S | nr_neigh_for_each_safe(a, - b, c, d) S | nr_node_for_each(a, - b, c) S | nr_node_for_each_safe(a, - b, c, d) S | - for_each_gfn_sp(a, c, d, b) S + for_each_gfn_sp(a, c, d) S | - for_each_gfn_indirect_valid_sp(a, c, d, b) S + for_each_gfn_indirect_valid_sp(a, c, d) S | for_each_host(a, - b, c) S | for_each_host_safe(a, - b, c, d) S | for_each_mesh_entry(a, - b, c, d) S ) ...+> [[email protected]: drop bogus change from net/ipv4/raw.c] [[email protected]: drop bogus hunk from net/ipv6/raw.c] [[email protected]: checkpatch fixes] [[email protected]: fix warnings] [[email protected]: redo intrusive kvm changes] Tested-by: Peter Senna Tschudin <[email protected]> Acked-by: Paul E. McKenney <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Cc: Wu Fengguang <[email protected]> Cc: Marcelo Tosatti <[email protected]> Cc: Gleb Natapov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 1e142b2 commit b67bfe0

File tree

218 files changed

+987
-1494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+987
-1494
lines changed

‎arch/arm/kernel/kprobes.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
395395
{
396396
struct kretprobe_instance *ri = NULL;
397397
struct hlist_head *head, empty_rp;
398-
struct hlist_node *node, *tmp;
398+
struct hlist_node *tmp;
399399
unsigned long flags, orig_ret_address = 0;
400400
unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline;
401401

@@ -415,7 +415,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
415415
* real return address, and all the rest will point to
416416
* kretprobe_trampoline
417417
*/
418-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
418+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
419419
if (ri->task != current)
420420
/* another task is sharing our hash bucket */
421421
continue;
@@ -442,7 +442,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
442442
kretprobe_assert(ri, orig_ret_address, trampoline_address);
443443
kretprobe_hash_unlock(current, &flags);
444444

445-
hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
445+
hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
446446
hlist_del(&ri->hlist);
447447
kfree(ri);
448448
}

‎arch/ia64/kernel/kprobes.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
423423
{
424424
struct kretprobe_instance *ri = NULL;
425425
struct hlist_head *head, empty_rp;
426-
struct hlist_node *node, *tmp;
426+
struct hlist_node *tmp;
427427
unsigned long flags, orig_ret_address = 0;
428428
unsigned long trampoline_address =
429429
((struct fnptr *)kretprobe_trampoline)->ip;
@@ -444,7 +444,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
444444
* real return address, and all the rest will point to
445445
* kretprobe_trampoline
446446
*/
447-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
447+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
448448
if (ri->task != current)
449449
/* another task is sharing our hash bucket */
450450
continue;
@@ -461,7 +461,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
461461

462462
regs->cr_iip = orig_ret_address;
463463

464-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
464+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
465465
if (ri->task != current)
466466
/* another task is sharing our hash bucket */
467467
continue;
@@ -487,7 +487,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
487487
kretprobe_hash_unlock(current, &flags);
488488
preempt_enable_no_resched();
489489

490-
hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
490+
hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
491491
hlist_del(&ri->hlist);
492492
kfree(ri);
493493
}

‎arch/mips/kernel/kprobes.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
598598
{
599599
struct kretprobe_instance *ri = NULL;
600600
struct hlist_head *head, empty_rp;
601-
struct hlist_node *node, *tmp;
601+
struct hlist_node *tmp;
602602
unsigned long flags, orig_ret_address = 0;
603603
unsigned long trampoline_address = (unsigned long)kretprobe_trampoline;
604604

@@ -618,7 +618,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
618618
* real return address, and all the rest will point to
619619
* kretprobe_trampoline
620620
*/
621-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
621+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
622622
if (ri->task != current)
623623
/* another task is sharing our hash bucket */
624624
continue;
@@ -645,7 +645,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
645645
kretprobe_hash_unlock(current, &flags);
646646
preempt_enable_no_resched();
647647

648-
hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
648+
hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
649649
hlist_del(&ri->hlist);
650650
kfree(ri);
651651
}

‎arch/powerpc/kernel/kprobes.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
310310
{
311311
struct kretprobe_instance *ri = NULL;
312312
struct hlist_head *head, empty_rp;
313-
struct hlist_node *node, *tmp;
313+
struct hlist_node *tmp;
314314
unsigned long flags, orig_ret_address = 0;
315315
unsigned long trampoline_address =(unsigned long)&kretprobe_trampoline;
316316

@@ -330,7 +330,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
330330
* real return address, and all the rest will point to
331331
* kretprobe_trampoline
332332
*/
333-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
333+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
334334
if (ri->task != current)
335335
/* another task is sharing our hash bucket */
336336
continue;
@@ -357,7 +357,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
357357
kretprobe_hash_unlock(current, &flags);
358358
preempt_enable_no_resched();
359359

360-
hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
360+
hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
361361
hlist_del(&ri->hlist);
362362
kfree(ri);
363363
}

‎arch/powerpc/kvm/book3s_mmu_hpte.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,14 @@ static void kvmppc_mmu_pte_flush_all(struct kvm_vcpu *vcpu)
124124
{
125125
struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);
126126
struct hpte_cache *pte;
127-
struct hlist_node *node;
128127
int i;
129128

130129
rcu_read_lock();
131130

132131
for (i = 0; i < HPTEG_HASH_NUM_VPTE_LONG; i++) {
133132
struct hlist_head *list = &vcpu3s->hpte_hash_vpte_long[i];
134133

135-
hlist_for_each_entry_rcu(pte, node, list, list_vpte_long)
134+
hlist_for_each_entry_rcu(pte, list, list_vpte_long)
136135
invalidate_pte(vcpu, pte);
137136
}
138137

@@ -143,7 +142,6 @@ static void kvmppc_mmu_pte_flush_page(struct kvm_vcpu *vcpu, ulong guest_ea)
143142
{
144143
struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);
145144
struct hlist_head *list;
146-
struct hlist_node *node;
147145
struct hpte_cache *pte;
148146

149147
/* Find the list of entries in the map */
@@ -152,7 +150,7 @@ static void kvmppc_mmu_pte_flush_page(struct kvm_vcpu *vcpu, ulong guest_ea)
152150
rcu_read_lock();
153151

154152
/* Check the list for matching entries and invalidate */
155-
hlist_for_each_entry_rcu(pte, node, list, list_pte)
153+
hlist_for_each_entry_rcu(pte, list, list_pte)
156154
if ((pte->pte.eaddr & ~0xfffUL) == guest_ea)
157155
invalidate_pte(vcpu, pte);
158156

@@ -163,7 +161,6 @@ static void kvmppc_mmu_pte_flush_long(struct kvm_vcpu *vcpu, ulong guest_ea)
163161
{
164162
struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);
165163
struct hlist_head *list;
166-
struct hlist_node *node;
167164
struct hpte_cache *pte;
168165

169166
/* Find the list of entries in the map */
@@ -173,7 +170,7 @@ static void kvmppc_mmu_pte_flush_long(struct kvm_vcpu *vcpu, ulong guest_ea)
173170
rcu_read_lock();
174171

175172
/* Check the list for matching entries and invalidate */
176-
hlist_for_each_entry_rcu(pte, node, list, list_pte_long)
173+
hlist_for_each_entry_rcu(pte, list, list_pte_long)
177174
if ((pte->pte.eaddr & 0x0ffff000UL) == guest_ea)
178175
invalidate_pte(vcpu, pte);
179176

@@ -207,7 +204,6 @@ static void kvmppc_mmu_pte_vflush_short(struct kvm_vcpu *vcpu, u64 guest_vp)
207204
{
208205
struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);
209206
struct hlist_head *list;
210-
struct hlist_node *node;
211207
struct hpte_cache *pte;
212208
u64 vp_mask = 0xfffffffffULL;
213209

@@ -216,7 +212,7 @@ static void kvmppc_mmu_pte_vflush_short(struct kvm_vcpu *vcpu, u64 guest_vp)
216212
rcu_read_lock();
217213

218214
/* Check the list for matching entries and invalidate */
219-
hlist_for_each_entry_rcu(pte, node, list, list_vpte)
215+
hlist_for_each_entry_rcu(pte, list, list_vpte)
220216
if ((pte->pte.vpage & vp_mask) == guest_vp)
221217
invalidate_pte(vcpu, pte);
222218

@@ -228,7 +224,6 @@ static void kvmppc_mmu_pte_vflush_long(struct kvm_vcpu *vcpu, u64 guest_vp)
228224
{
229225
struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);
230226
struct hlist_head *list;
231-
struct hlist_node *node;
232227
struct hpte_cache *pte;
233228
u64 vp_mask = 0xffffff000ULL;
234229

@@ -238,7 +233,7 @@ static void kvmppc_mmu_pte_vflush_long(struct kvm_vcpu *vcpu, u64 guest_vp)
238233
rcu_read_lock();
239234

240235
/* Check the list for matching entries and invalidate */
241-
hlist_for_each_entry_rcu(pte, node, list, list_vpte_long)
236+
hlist_for_each_entry_rcu(pte, list, list_vpte_long)
242237
if ((pte->pte.vpage & vp_mask) == guest_vp)
243238
invalidate_pte(vcpu, pte);
244239

@@ -266,7 +261,6 @@ void kvmppc_mmu_pte_vflush(struct kvm_vcpu *vcpu, u64 guest_vp, u64 vp_mask)
266261
void kvmppc_mmu_pte_pflush(struct kvm_vcpu *vcpu, ulong pa_start, ulong pa_end)
267262
{
268263
struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);
269-
struct hlist_node *node;
270264
struct hpte_cache *pte;
271265
int i;
272266

@@ -277,7 +271,7 @@ void kvmppc_mmu_pte_pflush(struct kvm_vcpu *vcpu, ulong pa_start, ulong pa_end)
277271
for (i = 0; i < HPTEG_HASH_NUM_VPTE_LONG; i++) {
278272
struct hlist_head *list = &vcpu3s->hpte_hash_vpte_long[i];
279273

280-
hlist_for_each_entry_rcu(pte, node, list, list_vpte_long)
274+
hlist_for_each_entry_rcu(pte, list, list_vpte_long)
281275
if ((pte->pte.raddr >= pa_start) &&
282276
(pte->pte.raddr < pa_end))
283277
invalidate_pte(vcpu, pte);

‎arch/s390/kernel/kprobes.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
354354
{
355355
struct kretprobe_instance *ri;
356356
struct hlist_head *head, empty_rp;
357-
struct hlist_node *node, *tmp;
357+
struct hlist_node *tmp;
358358
unsigned long flags, orig_ret_address;
359359
unsigned long trampoline_address;
360360
kprobe_opcode_t *correct_ret_addr;
@@ -379,7 +379,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
379379
orig_ret_address = 0;
380380
correct_ret_addr = NULL;
381381
trampoline_address = (unsigned long) &kretprobe_trampoline;
382-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
382+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
383383
if (ri->task != current)
384384
/* another task is sharing our hash bucket */
385385
continue;
@@ -398,7 +398,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
398398
kretprobe_assert(ri, orig_ret_address, trampoline_address);
399399

400400
correct_ret_addr = ri->ret_addr;
401-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
401+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
402402
if (ri->task != current)
403403
/* another task is sharing our hash bucket */
404404
continue;
@@ -427,7 +427,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
427427
kretprobe_hash_unlock(current, &flags);
428428
preempt_enable_no_resched();
429429

430-
hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
430+
hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
431431
hlist_del(&ri->hlist);
432432
kfree(ri);
433433
}

‎arch/s390/pci/pci_msi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ static DEFINE_SPINLOCK(msi_map_lock);
2525

2626
struct msi_desc *__irq_get_msi_desc(unsigned int irq)
2727
{
28-
struct hlist_node *entry;
2928
struct msi_map *map;
3029

31-
hlist_for_each_entry_rcu(map, entry,
30+
hlist_for_each_entry_rcu(map,
3231
&msi_hash[msi_hashfn(irq)], msi_chain)
3332
if (map->irq == irq)
3433
return map->msi;

‎arch/sh/kernel/kprobes.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
310310
{
311311
struct kretprobe_instance *ri = NULL;
312312
struct hlist_head *head, empty_rp;
313-
struct hlist_node *node, *tmp;
313+
struct hlist_node *tmp;
314314
unsigned long flags, orig_ret_address = 0;
315315
unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline;
316316

@@ -330,7 +330,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
330330
* real return address, and all the rest will point to
331331
* kretprobe_trampoline
332332
*/
333-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
333+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
334334
if (ri->task != current)
335335
/* another task is sharing our hash bucket */
336336
continue;
@@ -360,7 +360,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
360360

361361
preempt_enable_no_resched();
362362

363-
hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
363+
hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
364364
hlist_del(&ri->hlist);
365365
kfree(ri);
366366
}

‎arch/sparc/kernel/kprobes.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
511511
{
512512
struct kretprobe_instance *ri = NULL;
513513
struct hlist_head *head, empty_rp;
514-
struct hlist_node *node, *tmp;
514+
struct hlist_node *tmp;
515515
unsigned long flags, orig_ret_address = 0;
516516
unsigned long trampoline_address =(unsigned long)&kretprobe_trampoline;
517517

@@ -531,7 +531,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
531531
* real return address, and all the rest will point to
532532
* kretprobe_trampoline
533533
*/
534-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
534+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
535535
if (ri->task != current)
536536
/* another task is sharing our hash bucket */
537537
continue;
@@ -559,7 +559,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
559559
kretprobe_hash_unlock(current, &flags);
560560
preempt_enable_no_resched();
561561

562-
hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
562+
hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
563563
hlist_del(&ri->hlist);
564564
kfree(ri);
565565
}

‎arch/sparc/kernel/ldc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -953,9 +953,8 @@ static HLIST_HEAD(ldc_channel_list);
953953
static int __ldc_channel_exists(unsigned long id)
954954
{
955955
struct ldc_channel *lp;
956-
struct hlist_node *n;
957956

958-
hlist_for_each_entry(lp, n, &ldc_channel_list, list) {
957+
hlist_for_each_entry(lp, &ldc_channel_list, list) {
959958
if (lp->id == id)
960959
return 1;
961960
}

‎arch/x86/kernel/kprobes/core.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
652652
{
653653
struct kretprobe_instance *ri = NULL;
654654
struct hlist_head *head, empty_rp;
655-
struct hlist_node *node, *tmp;
655+
struct hlist_node *tmp;
656656
unsigned long flags, orig_ret_address = 0;
657657
unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline;
658658
kprobe_opcode_t *correct_ret_addr = NULL;
@@ -682,7 +682,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
682682
* will be the real return address, and all the rest will
683683
* point to kretprobe_trampoline.
684684
*/
685-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
685+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
686686
if (ri->task != current)
687687
/* another task is sharing our hash bucket */
688688
continue;
@@ -701,7 +701,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
701701
kretprobe_assert(ri, orig_ret_address, trampoline_address);
702702

703703
correct_ret_addr = ri->ret_addr;
704-
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
704+
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
705705
if (ri->task != current)
706706
/* another task is sharing our hash bucket */
707707
continue;
@@ -728,7 +728,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
728728

729729
kretprobe_hash_unlock(current, &flags);
730730

731-
hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
731+
hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
732732
hlist_del(&ri->hlist);
733733
kfree(ri);
734734
}

0 commit comments

Comments
 (0)