leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs/proc: convert to kstrtoX()

Browse Source 
Convert fs/proc/ from strict_strto*() to kstrto*() functions.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexey Dobriyan 2011-05-26 16:25:50 -07:00 committed by Linus Torvalds
parent 57cc083ad9
commit 0a8cb8e341
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/proc/base.c
View File

@ -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); err = kstrtoint(strstrip(buffer), 0, &nice);
if (err) if (err < 0)
return -EINVAL; return err;
p = get_proc_task(inode); p = get_proc_task(inode);
if (!p) if (!p)

8
fs/proc/task_mmu.c
View File

@ -536,15 +536,17 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
char buffer[PROC_NUMBUF]; char buffer[PROC_NUMBUF];
struct mm_struct *mm; struct mm_struct *mm;
struct vm_area_struct *vma; struct vm_area_struct *vma;
long type; int type;
int rv;
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
if (count > sizeof(buffer) - 1) if (count > sizeof(buffer) - 1)
count = sizeof(buffer) - 1; count = sizeof(buffer) - 1;
if (copy_from_user(buffer, buf, count)) if (copy_from_user(buffer, buf, count))
return -EFAULT; return -EFAULT;
if (strict_strtol(strstrip(buffer), 10, &type)) rv = kstrtoint(strstrip(buffer), 10, &type);
return -EINVAL; if (rv < 0)
return rv;
if (type < CLEAR_REFS_ALL || type > CLEAR_REFS_MAPPED) if (type < CLEAR_REFS_ALL || type > CLEAR_REFS_MAPPED)
return -EINVAL; return -EINVAL;
task = get_proc_task(file->f_path.dentry->d_inode); task = get_proc_task(file->f_path.dentry->d_inode);