lkml.org 
[lkml]   [2007]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] proc: seqfile convert proc_pid_statm
    Date

    This conversion is just for code cleanliness, uniformity, and general safety.

    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    ---
    fs/proc/array.c | 8 +++++---
    fs/proc/base.c | 4 ++--
    fs/proc/internal.h | 2 +-
    3 files changed, 8 insertions(+), 6 deletions(-)

    diff --git a/fs/proc/array.c b/fs/proc/array.c
    index d23d91d..b1a90c0 100644
    --- a/fs/proc/array.c
    +++ b/fs/proc/array.c
    @@ -553,7 +553,8 @@ int proc_tgid_stat(struct seq_file *m, struct pid_namespace *ns,
    return do_task_stat(m, ns, pid, task, 1);
    }

    -int proc_pid_statm(struct task_struct *task, char *buffer)
    +int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
    + struct pid *pid, struct task_struct *task)
    {
    int size = 0, resident = 0, shared = 0, text = 0, lib = 0, data = 0;
    struct mm_struct *mm = get_task_mm(task);
    @@ -562,7 +563,8 @@ int proc_pid_statm(struct task_struct *task, char *buffer)
    size = task_statm(mm, &shared, &text, &data, &resident);
    mmput(mm);
    }
    + seq_printf(m, "%d %d %d %d %d %d %d\n",
    + size, resident, shared, text, lib, data, 0);

    - return sprintf(buffer, "%d %d %d %d %d %d %d\n",
    - size, resident, shared, text, lib, data, 0);
    + return 0;
    }
    diff --git a/fs/proc/base.c b/fs/proc/base.c
    index 086a262..5b92b79 100644
    --- a/fs/proc/base.c
    +++ b/fs/proc/base.c
    @@ -2229,7 +2229,7 @@ static const struct pid_entry tgid_base_stuff[] = {
    #endif
    INF("cmdline", S_IRUGO, pid_cmdline),
    ONE("stat", S_IRUGO, tgid_stat),
    - INF("statm", S_IRUGO, pid_statm),
    + ONE("statm", S_IRUGO, pid_statm),
    REG("maps", S_IRUGO, maps),
    #ifdef CONFIG_NUMA
    REG("numa_maps", S_IRUGO, numa_maps),
    @@ -2550,7 +2550,7 @@ static const struct pid_entry tid_base_stuff[] = {
    #endif
    INF("cmdline", S_IRUGO, pid_cmdline),
    ONE("stat", S_IRUGO, tid_stat),
    - INF("statm", S_IRUGO, pid_statm),
    + ONE("statm", S_IRUGO, pid_statm),
    REG("maps", S_IRUGO, maps),
    #ifdef CONFIG_NUMA
    REG("numa_maps", S_IRUGO, numa_maps),
    diff --git a/fs/proc/internal.h b/fs/proc/internal.h
    index 0033645..4c17360 100644
    --- a/fs/proc/internal.h
    +++ b/fs/proc/internal.h
    @@ -49,7 +49,7 @@ extern int proc_exe_link(struct inode *, struct dentry **, struct vfsmount **);
    extern int proc_tid_stat(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task);
    extern int proc_tgid_stat(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task);
    extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task);
    -extern int proc_pid_statm(struct task_struct *, char *);
    +extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task);

    extern const struct file_operations proc_maps_operations;
    extern const struct file_operations proc_numa_maps_operations;
    --
    1.5.3.rc6.17.g1911
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-11-19 23:17    [W:5.707 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site