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, 23 insertions, 13 deletions

diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c
index f58ffc3b68a8..4a06d70ddf5e 100644
--- a/arch/xtensa/platforms/iss/simdisk.c
+++ b/arch/xtensa/platforms/iss/simdisk.c
@@ -214,20 +214,27 @@ static int simdisk_detach(struct simdisk *dev)
         return err;
 }
 
-static int proc_read_simdisk(char *page, char **start, off_t off,
-                int count, int *eof, void *data)
+static ssize_t proc_read_simdisk(struct file *file, char __user *buf,
+                        size_t size, loff_t *ppos)
 {
-        int len;
-        struct simdisk *dev = (struct simdisk *) data;
-        len = sprintf(page, "%s\n", dev->filename ? dev->filename : "");
-        return len;
+        struct simdisk *dev = PDE_DATA(file_inode(file));
+        char *s = dev->filename;
+        if (s) {
+                ssize_t n = simple_read_from_buffer(buf, size, ppos,
+                                                        s, strlen(s));
+                if (n < 0)
+                        return n;
+                buf += n;
+                size -= n;
+        }
+        return simple_read_from_buffer(buf, size, ppos, "\n", 1);
 }
 
-static int proc_write_simdisk(struct file *file, const char *buffer,
-                unsigned long count, void *data)
+static ssize_t proc_write_simdisk(struct file *file, const char __user *buf,
+                        size_t size, loff_t *ppos)
 {
         char *tmp = kmalloc(count + 1, GFP_KERNEL);
-        struct simdisk *dev = (struct simdisk *) data;
+        struct simdisk *dev = PDE_DATA(file_inode(file));
         int err;
 
         if (tmp == NULL)
@@ -256,6 +263,12 @@ out_free:
         return err;
 }
 
+static const struct file_operations fops = {
+        .read = proc_read_simdisk,
+        .write = proc_write_simdisk,
+        .llseek = default_llseek,
+};
+
 static int __init simdisk_setup(struct simdisk *dev, int which,
                 struct proc_dir_entry *procdir)
 {
@@ -289,10 +302,7 @@ static int __init simdisk_setup(struct simdisk *dev, int which,
         set_capacity(dev->gd, 0);
         add_disk(dev->gd);
 
-        dev->procfile = create_proc_entry(tmp, 0644, procdir);
-        dev->procfile->data = dev;
-        dev->procfile->read_proc = proc_read_simdisk;
-        dev->procfile->write_proc = proc_write_simdisk;
+        dev->procfile = proc_create_data(tmp, 0644, procdir, &fops, dev);
         return 0;
 
 out_alloc_disk: