File tree Expand file tree Collapse file tree 1 file changed +5
-10
lines changed Expand file tree Collapse file tree 1 file changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -498,11 +498,11 @@ static int register_trace_uprobe(struct trace_uprobe *tu)
498
498
struct trace_uprobe * old_tu ;
499
499
int ret ;
500
500
501
- mutex_lock (& event_mutex );
501
+ guard ( mutex ) (& event_mutex );
502
502
503
503
ret = validate_ref_ctr_offset (tu );
504
504
if (ret )
505
- goto end ;
505
+ return ret ;
506
506
507
507
/* register as an event */
508
508
old_tu = find_probe_event (trace_probe_name (& tu -> tp ),
@@ -511,11 +511,9 @@ static int register_trace_uprobe(struct trace_uprobe *tu)
511
511
if (is_ret_probe (tu ) != is_ret_probe (old_tu )) {
512
512
trace_probe_log_set_index (0 );
513
513
trace_probe_log_err (0 , DIFF_PROBE_TYPE );
514
- ret = - EEXIST ;
515
- } else {
516
- ret = append_trace_uprobe (tu , old_tu );
514
+ return - EEXIST ;
517
515
}
518
- goto end ;
516
+ return append_trace_uprobe ( tu , old_tu ) ;
519
517
}
520
518
521
519
ret = register_uprobe_event (tu );
@@ -525,14 +523,11 @@ static int register_trace_uprobe(struct trace_uprobe *tu)
525
523
trace_probe_log_err (0 , EVENT_EXIST );
526
524
} else
527
525
pr_warn ("Failed to register probe event(%d)\n" , ret );
528
- goto end ;
526
+ return ret ;
529
527
}
530
528
531
529
dyn_event_add (& tu -> devent , trace_probe_event_call (& tu -> tp ));
532
530
533
- end :
534
- mutex_unlock (& event_mutex );
535
-
536
531
return ret ;
537
532
}
538
533
You can’t perform that action at this time.
0 commit comments