procfs: kill ->write_proc()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 6bce60703c76d1c2cc989ba09b22c7c1c8c0dd05..51fcb201e289fa3b9abcdb6e530e5165ca886f86 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -196,30 +196,6 @@ proc_file_read(struct file *file, char __user *buf, size_t nbytes,
        return rv;
 }
 
-static ssize_t
-proc_file_write(struct file *file, const char __user *buffer,
-               size_t count, loff_t *ppos)
-{
-       struct proc_dir_entry *pde = PDE(file_inode(file));
-       ssize_t rv = -EIO;
-
-       if (pde->write_proc) {
-               spin_lock(&pde->pde_unload_lock);
-               if (!pde->proc_fops) {
-                       spin_unlock(&pde->pde_unload_lock);
-                       return rv;
-               }
-               pde->pde_users++;
-               spin_unlock(&pde->pde_unload_lock);
-
-               /* FIXME: does this routine need ppos?  probably... */
-               rv = pde->write_proc(file, buffer, count, pde->data);
-               pde_users_dec(pde);
-       }
-       return rv;
-}
-
-
 static loff_t
 proc_file_lseek(struct file *file, loff_t offset, int orig)
 {
@@ -239,7 +215,6 @@ proc_file_lseek(struct file *file, loff_t offset, int orig)
 static const struct file_operations proc_file_operations = {
        .llseek         = proc_file_lseek,
        .read           = proc_file_read,
-       .write          = proc_file_write,
 };
 
 static int proc_notify_change(struct dentry *dentry, struct iattr *iattr)

diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 94dfb2aa5533c3c6a2a661358a6da4c6555310d3..4f4137a0bd8a7ee1f55b316fd8457b246079fcd2 100644 (file)
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -72,7 +72,6 @@ struct proc_dir_entry {
        struct proc_dir_entry *next, *parent, *subdir;
        void *data;
        read_proc_t *read_proc;
-       write_proc_t *write_proc;
        atomic_t count;         /* use count */
        int pde_users;  /* number of callers into module in progress */
        struct completion *pde_unload_completion;