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
  ...

3 files changed, 18 insertions, 13 deletions

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 1a73b18683b6..8b03028cca69 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -1000,7 +1000,7 @@ static int xt_table_open(struct inode *inode, struct file *file)
                            sizeof(struct xt_names_priv));
         if (!ret) {
                 priv = ((struct seq_file *)file->private_data)->private;
-                priv->af = (unsigned long)PDE(inode)->data;
+                priv->af = (unsigned long)PDE_DATA(inode);
         }
         return ret;
 }
@@ -1148,7 +1148,7 @@ static int xt_match_open(struct inode *inode, struct file *file)
 
         seq = file->private_data;
         seq->private = trav;
-        trav->nfproto = (unsigned long)PDE(inode)->data;
+        trav->nfproto = (unsigned long)PDE_DATA(inode);
         return 0;
 }
 
@@ -1212,7 +1212,7 @@ static int xt_target_open(struct inode *inode, struct file *file)
 
         seq = file->private_data;
         seq->private = trav;
-        trav->nfproto = (unsigned long)PDE(inode)->data;
+        trav->nfproto = (unsigned long)PDE_DATA(inode);
         return 0;
 }
 
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 0199e7bb8f81..9ff035c71403 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -108,6 +108,7 @@ struct xt_hashlimit_htable {
 
         /* seq_file stuff */
         struct proc_dir_entry *pde;
+        const char *name;
         struct net *net;
 
         struct hlist_head hash[0];      /* hashtable itself */
@@ -254,6 +255,11 @@ static int htable_create(struct net *net, struct xt_hashlimit_mtinfo1 *minfo,
         hinfo->count = 0;
         hinfo->family = family;
         hinfo->rnd_initialized = false;
+        hinfo->name = kstrdup(minfo->name, GFP_KERNEL);
+        if (!hinfo->name) {
+                vfree(hinfo);
+                return -ENOMEM;
+        }
         spin_lock_init(&hinfo->lock);
 
         hinfo->pde = proc_create_data(minfo->name, 0,
@@ -261,6 +267,7 @@ static int htable_create(struct net *net, struct xt_hashlimit_mtinfo1 *minfo,
                 hashlimit_net->ipt_hashlimit : hashlimit_net->ip6t_hashlimit,
                 &dl_file_ops, hinfo);
         if (hinfo->pde == NULL) {
+                kfree(hinfo->name);
                 vfree(hinfo);
                 return -ENOMEM;
         }
@@ -331,9 +338,10 @@ static void htable_destroy(struct xt_hashlimit_htable *hinfo)
                 parent = hashlimit_net->ip6t_hashlimit;
 
         if(parent != NULL)
-                remove_proc_entry(hinfo->pde->name, parent);
+                remove_proc_entry(hinfo->name, parent);
 
         htable_selective_cleanup(hinfo, select_all);
+        kfree(hinfo->name);
         vfree(hinfo);
 }
 
@@ -345,7 +353,7 @@ static struct xt_hashlimit_htable *htable_find_get(struct net *net,
         struct xt_hashlimit_htable *hinfo;
 
         hlist_for_each_entry(hinfo, &hashlimit_net->htables, node) {
-                if (!strcmp(name, hinfo->pde->name) &&
+                if (!strcmp(name, hinfo->name) &&
                     hinfo->family == family) {
                         hinfo->use++;
                         return hinfo;
@@ -842,7 +850,7 @@ static int dl_proc_open(struct inode *inode, struct file *file)
 
         if (!ret) {
                 struct seq_file *sf = file->private_data;
-                sf->private = PDE(inode)->data;
+                sf->private = PDE_DATA(inode);
         }
         return ret;
 }
@@ -888,7 +896,7 @@ static void __net_exit hashlimit_proc_net_exit(struct net *net)
                 pde = hashlimit_net->ip6t_hashlimit;
 
         hlist_for_each_entry(hinfo, &hashlimit_net->htables, node)
-                remove_proc_entry(hinfo->pde->name, pde);
+                remove_proc_entry(hinfo->name, pde);
 
         hashlimit_net->ipt_hashlimit = NULL;
         hashlimit_net->ip6t_hashlimit = NULL;
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index d9cad315229d..1e657cf715c4 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -401,8 +401,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
                 ret = -ENOMEM;
                 goto out;
         }
-        pde->uid = uid;
-        pde->gid = gid;
+        proc_set_user(pde, uid, gid);
 #endif
         spin_lock_bh(&recent_lock);
         list_add_tail(&t->list, &recent_net->tables);
@@ -525,14 +524,13 @@ static const struct seq_operations recent_seq_ops = {
 
 static int recent_seq_open(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry *pde = PDE(inode);
         struct recent_iter_state *st;
 
         st = __seq_open_private(file, &recent_seq_ops, sizeof(*st));
         if (st == NULL)
                 return -ENOMEM;
 
-        st->table    = pde->data;
+        st->table    = PDE_DATA(inode);
         return 0;
 }
 
@@ -540,8 +538,7 @@ static ssize_t
 recent_mt_proc_write(struct file *file, const char __user *input,
                      size_t size, loff_t *loff)
 {
-        const struct proc_dir_entry *pde = PDE(file_inode(file));
-        struct recent_table *t = pde->data;
+        struct recent_table *t = PDE_DATA(file_inode(file));
         struct recent_entry *e;
         char buf[sizeof("+b335:1d35:1e55:dead:c0de:1715:5afe:c0de")];
         const char *c = buf;