proc: convert /proc/$PID/auxv to seq_file interface

[deliverable/linux.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 2d696b0c93bfbec6f1dd73ff4a8f71c9da569e4d..154bbd353b10732cc3fd637f16c38322891af410 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -105,7 +105,7 @@
  */
 
 struct pid_entry {
-       char *name;
+       const char *name;
        int len;
        umode_t mode;
        const struct inode_operations *iop;
@@ -205,22 +205,20 @@ static int proc_pid_cmdline(struct task_struct *task, char *buffer)
        return get_cmdline(task, buffer, PAGE_SIZE);
 }
 
-static int proc_pid_auxv(struct task_struct *task, char *buffer)
+static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
+                        struct pid *pid, struct task_struct *task)
 {
        struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
-       int res = PTR_ERR(mm);
        if (mm && !IS_ERR(mm)) {
                unsigned int nwords = 0;
                do {
                        nwords += 2;
                } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-               res = nwords * sizeof(mm->saved_auxv[0]);
-               if (res > PAGE_SIZE)
-                       res = PAGE_SIZE;
-               memcpy(buffer, mm->saved_auxv, res);
+               seq_write(m, mm->saved_auxv, nwords * sizeof(mm->saved_auxv[0]));
                mmput(mm);
-       }
-       return res;
+               return 0;
+       } else
+               return PTR_ERR(mm);
 }
 
 
@@ -418,8 +416,8 @@ static int proc_oom_score(struct task_struct *task, char *buffer)
 }
 
 struct limit_names {
-       char *name;
-       char *unit;
+       const char *name;
+       const char *unit;
 };
 
 static const struct limit_names lnames[RLIM_NLIMITS] = {
@@ -2056,7 +2054,7 @@ static int show_timer(struct seq_file *m, void *v)
        struct k_itimer *timer;
        struct timers_private *tp = m->private;
        int notify;
-       static char *nstr[] = {
+       static const char * const nstr[] = {
                [SIGEV_SIGNAL] = "signal",
                [SIGEV_NONE] = "none",
                [SIGEV_THREAD] = "thread",
@@ -2449,7 +2447,7 @@ static int proc_tgid_io_accounting(struct task_struct *task, char *buffer)
 
 #ifdef CONFIG_USER_NS
 static int proc_id_map_open(struct inode *inode, struct file *file,
-       struct seq_operations *seq_ops)
+       const struct seq_operations *seq_ops)
 {
        struct user_namespace *ns = NULL;
        struct task_struct *task;
@@ -2557,7 +2555,7 @@ static const struct pid_entry tgid_base_stuff[] = {
        DIR("net",        S_IRUGO|S_IXUGO, proc_net_inode_operations, proc_net_operations),
 #endif
        REG("environ",    S_IRUSR, proc_environ_operations),
-       INF("auxv",       S_IRUSR, proc_pid_auxv),
+       ONE("auxv",       S_IRUSR, proc_pid_auxv),
        ONE("status",     S_IRUGO, proc_pid_status),
        ONE("personality", S_IRUSR, proc_pid_personality),
        INF("limits",     S_IRUGO, proc_pid_limits),
@@ -2780,12 +2778,12 @@ out:
 
 struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags)
 {
-       int result = 0;
+       int result = -ENOENT;
        struct task_struct *task;
        unsigned tgid;
        struct pid_namespace *ns;
 
-       tgid = name_to_int(dentry);
+       tgid = name_to_int(&dentry->d_name);
        if (tgid == ~0U)
                goto out;
 
@@ -2896,7 +2894,7 @@ static const struct pid_entry tid_base_stuff[] = {
        DIR("fdinfo",    S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fdinfo_operations),
        DIR("ns",        S_IRUSR|S_IXUGO, proc_ns_dir_inode_operations, proc_ns_dir_operations),
        REG("environ",   S_IRUSR, proc_environ_operations),
-       INF("auxv",      S_IRUSR, proc_pid_auxv),
+       ONE("auxv",      S_IRUSR, proc_pid_auxv),
        ONE("status",    S_IRUGO, proc_pid_status),
        ONE("personality", S_IRUSR, proc_pid_personality),
        INF("limits",    S_IRUGO, proc_pid_limits),
@@ -3033,7 +3031,7 @@ static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry
        if (!leader)
                goto out_no_task;
 
-       tid = name_to_int(dentry);
+       tid = name_to_int(&dentry->d_name);
        if (tid == ~0U)
                goto out;