[PATCH] sysctl: remove the proc_dir_entry member for the sysctl tables

It isn't needed anymore, all of the users are gone, and all of the ctl_table
initializers have been converted to use explicit names of the fields they are
initializing.

[akpm@osdl.org: NTFS fix]
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 0 insertions, 15 deletions

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 0977df42c205..060d725e2942 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -261,7 +261,6 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *
         for(i = 0; i < ARRAY_SIZE(t->dn_dev_vars) - 1; i++) {
                 long offset = (long)t->dn_dev_vars[i].data;
                 t->dn_dev_vars[i].data = ((char *)parms) + offset;
-                t->dn_dev_vars[i].de = NULL;
         }
 
         if (dev) {
@@ -273,13 +272,9 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *
         }
 
         t->dn_dev_dev[0].child = t->dn_dev_vars;
-        t->dn_dev_dev[0].de = NULL;
         t->dn_dev_conf_dir[0].child = t->dn_dev_dev;
-        t->dn_dev_conf_dir[0].de = NULL;
         t->dn_dev_proto_dir[0].child = t->dn_dev_conf_dir;
-        t->dn_dev_proto_dir[0].de = NULL;
         t->dn_dev_root_dir[0].child = t->dn_dev_proto_dir;
-        t->dn_dev_root_dir[0].de = NULL;
         t->dn_dev_vars[0].extra1 = (void *)dev;
 
         t->sysctl_header = register_sysctl_table(t->dn_dev_root_dir);
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index bf3eb2dc7662..8a0ec10a13a7 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1576,7 +1576,6 @@ static void devinet_sysctl_register(struct in_device *in_dev,
                 return;
         for (i = 0; i < ARRAY_SIZE(t->devinet_vars) - 1; i++) {
                 t->devinet_vars[i].data += (char *)p - (char *)&ipv4_devconf;
-                t->devinet_vars[i].de = NULL;
         }
 
         if (dev) {
@@ -1598,13 +1597,9 @@ static void devinet_sysctl_register(struct in_device *in_dev,
 
         t->devinet_dev[0].procname    = dev_name;
         t->devinet_dev[0].child       = t->devinet_vars;
-        t->devinet_dev[0].de          = NULL;
         t->devinet_conf_dir[0].child  = t->devinet_dev;
-        t->devinet_conf_dir[0].de     = NULL;
         t->devinet_proto_dir[0].child = t->devinet_conf_dir;
-        t->devinet_proto_dir[0].de    = NULL;
         t->devinet_root_dir[0].child  = t->devinet_proto_dir;
-        t->devinet_root_dir[0].de     = NULL;
 
         t->sysctl_header = register_sysctl_table(t->devinet_root_dir);
         if (!t->sysctl_header)
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 34d80b4aaa04..569a37d698f7 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3998,7 +3998,6 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf
                 return;
         for (i=0; t->addrconf_vars[i].data; i++) {
                 t->addrconf_vars[i].data += (char*)p - (char*)&ipv6_devconf;
-                t->addrconf_vars[i].de = NULL;
                 t->addrconf_vars[i].extra1 = idev; /* embedded; no ref */
         }
         if (dev) {
@@ -4021,13 +4020,9 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf
         t->addrconf_dev[0].procname = dev_name;
 
         t->addrconf_dev[0].child = t->addrconf_vars;
-        t->addrconf_dev[0].de = NULL;
         t->addrconf_conf_dir[0].child = t->addrconf_dev;
-        t->addrconf_conf_dir[0].de = NULL;
         t->addrconf_proto_dir[0].child = t->addrconf_conf_dir;
-        t->addrconf_proto_dir[0].de = NULL;
         t->addrconf_root_dir[0].child = t->addrconf_proto_dir;
-        t->addrconf_root_dir[0].de = NULL;
 
         t->sysctl_header = register_sysctl_table(t->addrconf_root_dir);
         if (t->sysctl_header == NULL)