procfs: use simple_read_from_buffer()
PATCH 1/1 procfs: use simple_read_from_buffer()
Cleanup using simple_read_from_buffer() in procfs.
Signed-off-by Akinobu Mita <[email protected]>
--- fs/proc/base.c | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-)
fs/proc/base.c +7 -28
@@ -652,7 +652,6 @@ static ssize_t oom_adjust_read(struct fichar buffer[PROC_NUMBUF ];size_t len;int oom_adjust; -loff_t __ppos = *ppos;if (!task)return -ESRCH ;
@@ -660,14 +659,8 @@ static ssize_t oom_adjust_read(struct fiput_task_struct (task); len =snprintf (buffer,sizeof (buffer),"%i\n" , oom_adjust); -if (__ppos >= len) -return 0 ; -if (count > len-__ppos) - count = len-__ppos; -if (copy_to_user (buf, buffer + __ppos, count)) -return -EFAULT ; - *ppos = __ppos + count; -return count; + +return simple_read_from_buffer (buf, count, ppos, buffer, len); } static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
@@ -781,7 +774,6 @@ static ssize_t seccomp_read(struct file {struct task_struct *tsk =get_proc_task (file->f_dentry->d_inode);char __buf[20 ]; -loff_t __ppos = *ppos;size_t len;if (!tsk)
@@ -789,14 +781,8 @@ static ssize_t seccomp_read(struct file/* no need to print the trailing zero, so use only len */ len =sprintf (__buf,"%u\n" , tsk->seccomp.mode);put_task_struct (tsk); -if (__ppos >= len) -return 0 ; -if (count > len - __ppos) - count = len - __ppos; -if (copy_to_user (buf, __buf + __ppos, count)) -return -EFAULT ; - *ppos = __ppos + count; -return count; + +return simple_read_from_buffer (buf, count, ppos, __buf, len); } static ssize_t seccomp_write(struct file *file, const char __user *buf,
@@ -855,7 +841,6 @@ static ssize_t proc_fault_inject_read(stchar buffer[PROC_NUMBUF ];size_t len;int make_it_fail; -loff_t __ppos = *ppos;if (!task)return -ESRCH ;
@@ -863,14 +848,8 @@ static ssize_t proc_fault_inject_read(stput_task_struct (task); len =snprintf (buffer,sizeof (buffer),"%i\n" , make_it_fail); -if (__ppos >= len) -return 0 ; -if (count > len-__ppos) - count = len-__ppos; -if (copy_to_user (buf, buffer + __ppos, count)) -return -EFAULT ; - *ppos = __ppos + count; -return count; + +return simple_read_from_buffer (buf, count, ppos, buffer, len); } static ssize_t proc_fault_inject_write(struct file * file,
@@ -934,7 +913,7 @@ static int do_proc_readlink(struct dentrif (!tmp)return -ENOMEM ; - + inode = dentry->d_inode; path =d_path (dentry, mnt, tmp,PAGE_SIZE ); len =PTR_ERR (path);