|
@@ -1083,15 +1083,9 @@ static ssize_t oom_adj_write(struct file *file, const char __user *buf,
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
- task_lock(task);
|
|
|
|
- if (!task->mm) {
|
|
|
|
- err = -EINVAL;
|
|
|
|
- goto err_task_lock;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
if (!lock_task_sighand(task, &flags)) {
|
|
if (!lock_task_sighand(task, &flags)) {
|
|
err = -ESRCH;
|
|
err = -ESRCH;
|
|
- goto err_task_lock;
|
|
|
|
|
|
+ goto err_put_task;
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -1121,8 +1115,7 @@ static ssize_t oom_adj_write(struct file *file, const char __user *buf,
|
|
trace_oom_score_adj_update(task);
|
|
trace_oom_score_adj_update(task);
|
|
err_sighand:
|
|
err_sighand:
|
|
unlock_task_sighand(task, &flags);
|
|
unlock_task_sighand(task, &flags);
|
|
-err_task_lock:
|
|
|
|
- task_unlock(task);
|
|
|
|
|
|
+err_put_task:
|
|
put_task_struct(task);
|
|
put_task_struct(task);
|
|
out:
|
|
out:
|
|
return err < 0 ? err : count;
|
|
return err < 0 ? err : count;
|
|
@@ -1186,15 +1179,9 @@ static ssize_t oom_score_adj_write(struct file *file, const char __user *buf,
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
- task_lock(task);
|
|
|
|
- if (!task->mm) {
|
|
|
|
- err = -EINVAL;
|
|
|
|
- goto err_task_lock;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
if (!lock_task_sighand(task, &flags)) {
|
|
if (!lock_task_sighand(task, &flags)) {
|
|
err = -ESRCH;
|
|
err = -ESRCH;
|
|
- goto err_task_lock;
|
|
|
|
|
|
+ goto err_put_task;
|
|
}
|
|
}
|
|
|
|
|
|
if ((short)oom_score_adj < task->signal->oom_score_adj_min &&
|
|
if ((short)oom_score_adj < task->signal->oom_score_adj_min &&
|
|
@@ -1210,8 +1197,7 @@ static ssize_t oom_score_adj_write(struct file *file, const char __user *buf,
|
|
|
|
|
|
err_sighand:
|
|
err_sighand:
|
|
unlock_task_sighand(task, &flags);
|
|
unlock_task_sighand(task, &flags);
|
|
-err_task_lock:
|
|
|
|
- task_unlock(task);
|
|
|
|
|
|
+err_put_task:
|
|
put_task_struct(task);
|
|
put_task_struct(task);
|
|
out:
|
|
out:
|
|
return err < 0 ? err : count;
|
|
return err < 0 ? err : count;
|