|
@@ -1059,7 +1059,7 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
|
|
{
|
|
{
|
|
struct task_struct *task;
|
|
struct task_struct *task;
|
|
char buffer[PROC_NUMBUF];
|
|
char buffer[PROC_NUMBUF];
|
|
- long oom_adjust;
|
|
|
|
|
|
+ int oom_adjust;
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
int err;
|
|
int err;
|
|
|
|
|
|
@@ -1071,7 +1071,7 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
- err = strict_strtol(strstrip(buffer), 0, &oom_adjust);
|
|
|
|
|
|
+ err = kstrtoint(strstrip(buffer), 0, &oom_adjust);
|
|
if (err)
|
|
if (err)
|
|
goto out;
|
|
goto out;
|
|
if ((oom_adjust < OOM_ADJUST_MIN || oom_adjust > OOM_ADJUST_MAX) &&
|
|
if ((oom_adjust < OOM_ADJUST_MIN || oom_adjust > OOM_ADJUST_MAX) &&
|
|
@@ -1168,7 +1168,7 @@ static ssize_t oom_score_adj_write(struct file *file, const char __user *buf,
|
|
struct task_struct *task;
|
|
struct task_struct *task;
|
|
char buffer[PROC_NUMBUF];
|
|
char buffer[PROC_NUMBUF];
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
- long oom_score_adj;
|
|
|
|
|
|
+ int oom_score_adj;
|
|
int err;
|
|
int err;
|
|
|
|
|
|
memset(buffer, 0, sizeof(buffer));
|
|
memset(buffer, 0, sizeof(buffer));
|
|
@@ -1179,7 +1179,7 @@ static ssize_t oom_score_adj_write(struct file *file, const char __user *buf,
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
- err = strict_strtol(strstrip(buffer), 0, &oom_score_adj);
|
|
|
|
|
|
+ err = kstrtoint(strstrip(buffer), 0, &oom_score_adj);
|
|
if (err)
|
|
if (err)
|
|
goto out;
|
|
goto out;
|
|
if (oom_score_adj < OOM_SCORE_ADJ_MIN ||
|
|
if (oom_score_adj < OOM_SCORE_ADJ_MIN ||
|
|
@@ -1468,7 +1468,7 @@ sched_autogroup_write(struct file *file, const char __user *buf,
|
|
struct inode *inode = file->f_path.dentry->d_inode;
|
|
struct inode *inode = file->f_path.dentry->d_inode;
|
|
struct task_struct *p;
|
|
struct task_struct *p;
|
|
char buffer[PROC_NUMBUF];
|
|
char buffer[PROC_NUMBUF];
|
|
- long nice;
|
|
|
|
|
|
+ int nice;
|
|
int err;
|
|
int err;
|
|
|
|
|
|
memset(buffer, 0, sizeof(buffer));
|
|
memset(buffer, 0, sizeof(buffer));
|
|
@@ -1477,9 +1477,9 @@ sched_autogroup_write(struct file *file, const char __user *buf,
|
|
if (copy_from_user(buffer, buf, count))
|
|
if (copy_from_user(buffer, buf, count))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- err = strict_strtol(strstrip(buffer), 0, &nice);
|
|
|
|
- if (err)
|
|
|
|
- return -EINVAL;
|
|
|
|
|
|
+ err = kstrtoint(strstrip(buffer), 0, &nice);
|
|
|
|
+ if (err < 0)
|
|
|
|
+ return err;
|
|
|
|
|
|
p = get_proc_task(inode);
|
|
p = get_proc_task(inode);
|
|
if (!p)
|
|
if (!p)
|