|
@@ -2835,16 +2835,12 @@ retry:
|
|
|
unclone_ctx(ctx);
|
|
|
++ctx->pin_count;
|
|
|
raw_spin_unlock_irqrestore(&ctx->lock, flags);
|
|
|
- }
|
|
|
-
|
|
|
- if (!ctx) {
|
|
|
+ } else {
|
|
|
ctx = alloc_perf_context(pmu, task);
|
|
|
err = -ENOMEM;
|
|
|
if (!ctx)
|
|
|
goto errout;
|
|
|
|
|
|
- get_ctx(ctx);
|
|
|
-
|
|
|
err = 0;
|
|
|
mutex_lock(&task->perf_event_mutex);
|
|
|
/*
|
|
@@ -2856,14 +2852,14 @@ retry:
|
|
|
else if (task->perf_event_ctxp[ctxn])
|
|
|
err = -EAGAIN;
|
|
|
else {
|
|
|
+ get_ctx(ctx);
|
|
|
++ctx->pin_count;
|
|
|
rcu_assign_pointer(task->perf_event_ctxp[ctxn], ctx);
|
|
|
}
|
|
|
mutex_unlock(&task->perf_event_mutex);
|
|
|
|
|
|
if (unlikely(err)) {
|
|
|
- put_task_struct(task);
|
|
|
- kfree(ctx);
|
|
|
+ put_ctx(ctx);
|
|
|
|
|
|
if (err == -EAGAIN)
|
|
|
goto retry;
|