Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull VFS updates from Al Viro,

Misc cleanups all over the place, mainly wrt /proc interfaces (switch
create_proc_entry to proc_create(), get rid of the deprecated
create_proc_read_entry() in favor of using proc_create_data() and
seq_file etc).

7kloc removed.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
  don't bother with deferred freeing of fdtables
  proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
  proc: Make the PROC_I() and PDE() macros internal to procfs
  proc: Supply a function to remove a proc entry by PDE
  take cgroup_open() and cpuset_open() to fs/proc/base.c
  ppc: Clean up scanlog
  ppc: Clean up rtas_flash driver somewhat
  hostap: proc: Use remove_proc_subtree()
  drm: proc: Use remove_proc_subtree()
  drm: proc: Use minor->index to label things, not PDE->name
  drm: Constify drm_proc_list[]
  zoran: Don't print proc_dir_entry data in debug
  reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
  proc: Supply an accessor for getting the data from a PDE's parent
  airo: Use remove_proc_subtree()
  rtl8192u: Don't need to save device proc dir PDE
  rtl8187se: Use a dir under /proc/net/r8180/
  proc: Add proc_mkdir_data()
  proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
  proc: Move PDE_NET() to fs/proc/proc_net.c
  ...

1 files changed, 52 insertions, 94 deletions

diff --git a/arch/ia64/sn/kernel/sn2/prominfo_proc.c b/arch/ia64/sn/kernel/sn2/prominfo_proc.c
index 20b88cb1881a..daa8d6badb16 100644
--- a/arch/ia64/sn/kernel/sn2/prominfo_proc.c
+++ b/arch/ia64/sn/kernel/sn2/prominfo_proc.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/nodemask.h>
 #include <asm/io.h>
 #include <asm/sn/sn_sal.h>
@@ -101,18 +102,18 @@ get_fit_entry(unsigned long nasid, int index, unsigned long *fentry,
 /*
  * These two routines display the FIT table for each node.
  */
-static int dump_fit_entry(char *page, unsigned long *fentry)
+static void dump_fit_entry(struct seq_file *m, unsigned long *fentry)
 {
         unsigned type;
 
         type = FIT_TYPE(fentry[1]);
-        return sprintf(page, "%02x %-25s %x.%02x %016lx %u\n",
-                       type,
-                       fit_type_name(type),
-                       FIT_MAJOR(fentry[1]), FIT_MINOR(fentry[1]),
-                       fentry[0],
-                       /* mult by sixteen to get size in bytes */
-                       (unsigned)(fentry[1] & 0xffffff) * 16);
+        seq_printf(m, "%02x %-25s %x.%02x %016lx %u\n",
+                   type,
+                   fit_type_name(type),
+                   FIT_MAJOR(fentry[1]), FIT_MINOR(fentry[1]),
+                   fentry[0],
+                   /* mult by sixteen to get size in bytes */
+                   (unsigned)(fentry[1] & 0xffffff) * 16);
 }
 
 
@@ -124,31 +125,39 @@ static int dump_fit_entry(char *page, unsigned long *fentry)
  * OK except for 4kB pages (and no one is going to do that on SN
  * anyway).
  */
-static int
-dump_fit(char *page, unsigned long nasid)
+static int proc_fit_show(struct seq_file *m, void *v)
 {
+        unsigned long nasid = (unsigned long)m->private;
         unsigned long fentry[2];
         int index;
-        char *p;
 
-        p = page;
         for (index=0;;index++) {
                 BUG_ON(index * 60 > PAGE_SIZE);
                 if (get_fit_entry(nasid, index, fentry, NULL, 0))
                         break;
-                p += dump_fit_entry(p, fentry);
+                dump_fit_entry(m, fentry);
         }
+        return 0;
+}
 
-        return p - page;
+static int proc_fit_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, proc_fit_show, PDE_DATA(inode));
 }
 
-static int
-dump_version(char *page, unsigned long nasid)
+static const struct file_operations proc_fit_fops = {
+        .open           = proc_fit_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
+static int proc_version_show(struct seq_file *m, void *v)
 {
+        unsigned long nasid = (unsigned long)m->private;
         unsigned long fentry[2];
         char banner[128];
         int index;
-        int len;
 
         for (index = 0; ; index++) {
                 if (get_fit_entry(nasid, index, fentry, banner,
@@ -158,56 +167,24 @@ dump_version(char *page, unsigned long nasid)
                         break;
         }
 
-        len = sprintf(page, "%x.%02x\n", FIT_MAJOR(fentry[1]),
-                      FIT_MINOR(fentry[1]));
-        page += len;
+        seq_printf(m, "%x.%02x\n", FIT_MAJOR(fentry[1]), FIT_MINOR(fentry[1]));
 
         if (banner[0])
-                len += snprintf(page, PAGE_SIZE-len, "%s\n", banner);
-
-        return len;
-}
-
-/* same as in proc_misc.c */
-static int
-proc_calc_metrics(char *page, char **start, off_t off, int count, int *eof,
-                  int len)
-{
-        if (len <= off + count)
-                *eof = 1;
-        *start = page + off;
-        len -= off;
-        if (len > count)
-                len = count;
-        if (len < 0)
-                len = 0;
-        return len;
+                seq_printf(m, "%s\n", banner);
+        return 0;
 }
 
-static int
-read_version_entry(char *page, char **start, off_t off, int count, int *eof,
-                   void *data)
+static int proc_version_open(struct inode *inode, struct file *file)
 {
-        int len;
-
-        /* data holds the NASID of the node */
-        len = dump_version(page, (unsigned long)data);
-        len = proc_calc_metrics(page, start, off, count, eof, len);
-        return len;
+        return single_open(file, proc_version_show, PDE_DATA(inode));
 }
 
-static int
-read_fit_entry(char *page, char **start, off_t off, int count, int *eof,
-               void *data)
-{
-        int len;
-
-        /* data holds the NASID of the node */
-        len = dump_fit(page, (unsigned long)data);
-        len = proc_calc_metrics(page, start, off, count, eof, len);
-
-        return len;
-}
+static const struct file_operations proc_version_fops = {
+        .open           = proc_version_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
 
 /* module entry points */
 int __init prominfo_init(void);
@@ -216,58 +193,39 @@ void __exit prominfo_exit(void);
 module_init(prominfo_init);
 module_exit(prominfo_exit);
 
-static struct proc_dir_entry **proc_entries;
-static struct proc_dir_entry *sgi_prominfo_entry;
-
 #define NODE_NAME_LEN 11
 
 int __init prominfo_init(void)
 {
-        struct proc_dir_entry **entp;
+        struct proc_dir_entry *sgi_prominfo_entry;
         cnodeid_t cnodeid;
-        unsigned long nasid;
-        int size;
-        char name[NODE_NAME_LEN];
 
         if (!ia64_platform_is("sn2"))
                 return 0;
 
-        size = num_online_nodes() * sizeof(struct proc_dir_entry *);
-        proc_entries = kzalloc(size, GFP_KERNEL);
-        if (!proc_entries)
-                return -ENOMEM;
-
         sgi_prominfo_entry = proc_mkdir("sgi_prominfo", NULL);
+        if (!sgi_prominfo_entry)
+                return -ENOMEM;
 
-        entp = proc_entries;
         for_each_online_node(cnodeid) {
+                struct proc_dir_entry *dir;
+                unsigned long nasid;
+                char name[NODE_NAME_LEN];
+
                 sprintf(name, "node%d", cnodeid);
-                *entp = proc_mkdir(name, sgi_prominfo_entry);
+                dir = proc_mkdir(name, sgi_prominfo_entry);
+                if (!dir)
+                        continue;
                 nasid = cnodeid_to_nasid(cnodeid);
-                create_proc_read_entry("fit", 0, *entp, read_fit_entry,
-                                           (void *)nasid);
-                create_proc_read_entry("version", 0, *entp,
-                                           read_version_entry, (void *)nasid);
-                entp++;
+                proc_create_data("fit", 0, dir,
+                                 &proc_fit_fops, (void *)nasid);
+                proc_create_data("version", 0, dir,
+                                 &proc_version_fops, (void *)nasid);
         }
-
         return 0;
 }
 
 void __exit prominfo_exit(void)
 {
-        struct proc_dir_entry **entp;
-        unsigned int cnodeid;
-        char name[NODE_NAME_LEN];
-
-        entp = proc_entries;
-        for_each_online_node(cnodeid) {
-                remove_proc_entry("fit", *entp);
-                remove_proc_entry("version", *entp);
-                sprintf(name, "node%d", cnodeid);
-                remove_proc_entry(name, sgi_prominfo_entry);
-                entp++;
-        }
-        remove_proc_entry("sgi_prominfo", NULL);
-        kfree(proc_entries);
+        remove_proc_subtree("sgi_prominfo", NULL);
 }