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

diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 0b009470e6db..08126087ec31 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -46,9 +46,7 @@ proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
 static ssize_t
 proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
 {
-        const struct inode *ino = file_inode(file);
-        const struct proc_dir_entry *dp = PDE(ino);
-        struct pci_dev *dev = dp->data;
+        struct pci_dev *dev = PDE_DATA(file_inode(file));
         unsigned int pos = *ppos;
         unsigned int cnt, size;
 
@@ -59,7 +57,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
          */
 
         if (capable(CAP_SYS_ADMIN))
-                size = dp->size;
+                size = dev->cfg_size;
         else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
                 size = 128;
         else
@@ -133,10 +131,9 @@ static ssize_t
 proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, loff_t *ppos)
 {
         struct inode *ino = file_inode(file);
-        const struct proc_dir_entry *dp = PDE(ino);
-        struct pci_dev *dev = dp->data;
+        struct pci_dev *dev = PDE_DATA(ino);
         int pos = *ppos;
-        int size = dp->size;
+        int size = dev->cfg_size;
         int cnt;
 
         if (pos >= size)
@@ -200,7 +197,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
         pci_config_pm_runtime_put(dev);
 
         *ppos = pos;
-        i_size_write(ino, dp->size);
+        i_size_write(ino, dev->cfg_size);
         return nbytes;
 }
 
@@ -212,8 +209,7 @@ struct pci_filp_private {
 static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
                                unsigned long arg)
 {
-        const struct proc_dir_entry *dp = PDE(file_inode(file));
-        struct pci_dev *dev = dp->data;
+        struct pci_dev *dev = PDE_DATA(file_inode(file));
 #ifdef HAVE_PCI_MMAP
         struct pci_filp_private *fpriv = file->private_data;
 #endif /* HAVE_PCI_MMAP */
@@ -253,9 +249,7 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
 #ifdef HAVE_PCI_MMAP
 static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct inode *inode = file_inode(file);
-        const struct proc_dir_entry *dp = PDE(inode);
-        struct pci_dev *dev = dp->data;
+        struct pci_dev *dev = PDE_DATA(file_inode(file));
         struct pci_filp_private *fpriv = file->private_data;
         int i, ret;
 
@@ -425,7 +419,7 @@ int pci_proc_attach_device(struct pci_dev *dev)
                              &proc_bus_pci_operations, dev);
         if (!e)
                 return -ENOMEM;
-        e->size = dev->cfg_size;
+        proc_set_size(e, dev->cfg_size);
         dev->procent = e;
 
         return 0;
@@ -433,20 +427,14 @@ int pci_proc_attach_device(struct pci_dev *dev)
 
 int pci_proc_detach_device(struct pci_dev *dev)
 {
-        struct proc_dir_entry *e;
-
-        if ((e = dev->procent)) {
-                remove_proc_entry(e->name, dev->bus->procdir);
-                dev->procent = NULL;
-        }
+        proc_remove(dev->procent);
+        dev->procent = NULL;
         return 0;
 }
 
 int pci_proc_detach_bus(struct pci_bus* bus)
 {
-        struct proc_dir_entry *de = bus->procdir;
-        if (de)
-                remove_proc_entry(de->name, proc_bus_pci_dir);
+        proc_remove(bus->procdir);
         return 0;
 }