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

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>

diff --git a/arch/tile/include/asm/hardwall.h b/arch/tile/include/asm/hardwall.h
index 2f572b6..44d2765 100644 (file)
--- a/arch/tile/include/asm/hardwall.h
+++ b/arch/tile/include/asm/hardwall.h
@@ -23,7 +23,7 @@
 struct proc_dir_entry;
 #ifdef CONFIG_HARDWALL
 void proc_tile_hardwall_init(struct proc_dir_entry *root);
-int proc_pid_hardwall(struct task_struct *task, char *buffer);
+int proc_pid_hardwall(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task);
 #else
 static inline void proc_tile_hardwall_init(struct proc_dir_entry *root) {}
 #endif

diff --git a/arch/tile/kernel/hardwall.c b/arch/tile/kernel/hardwall.c
index 531f4c3..aca6000 100644 (file)
--- a/arch/tile/kernel/hardwall.c
+++ b/arch/tile/kernel/hardwall.c
@@ -947,15 +947,15 @@ static void hardwall_remove_proc(struct hardwall_info *info)
        remove_proc_entry(buf, info->type->proc_dir);
 }
 
-int proc_pid_hardwall(struct task_struct *task, char *buffer)
+int proc_pid_hardwall(struct seq_file *m, struct pid_namespace *ns,
+                     struct pid *pid, struct task_struct *task)
 {
        int i;
        int n = 0;
        for (i = 0; i < HARDWALL_TYPES; ++i) {
                struct hardwall_info *info = task->thread.hardwall[i].info;
                if (info)
-                       n += sprintf(&buffer[n], "%s: %d\n",
-                                    info->type->name, info->id);
+                       seq_printf(m, "%s: %d\n", info->type->name, info->id);
        }
        return n;
 }

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 089373e..be41e8b 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2636,7 +2636,7 @@ static const struct pid_entry tgid_base_stuff[] = {
        ONE("io",       S_IRUSR, proc_tgid_io_accounting),
 #endif
 #ifdef CONFIG_HARDWALL
-       INF("hardwall",   S_IRUGO, proc_pid_hardwall),
+       ONE("hardwall",   S_IRUGO, proc_pid_hardwall),
 #endif
 #ifdef CONFIG_USER_NS
        REG("uid_map",    S_IRUGO|S_IWUSR, proc_uid_map_operations),
@@ -2971,7 +2971,7 @@ static const struct pid_entry tid_base_stuff[] = {
        ONE("io",       S_IRUSR, proc_tid_io_accounting),
 #endif
 #ifdef CONFIG_HARDWALL
-       INF("hardwall",   S_IRUGO, proc_pid_hardwall),
+       ONE("hardwall",   S_IRUGO, proc_pid_hardwall),
 #endif
 #ifdef CONFIG_USER_NS
        REG("uid_map",    S_IRUGO|S_IWUSR, proc_uid_map_operations),