Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fbfa981 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[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: default avatarEric W. Biederman <ebiederm@xmission.com>
Acked-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d912b0cc

fs/ntfs/sysctl.c

+0 −8
Original line number Diff line number Diff line
@@ -73,14 +73,6 @@ int ntfs_sysctl(int add) 
		sysctls_root_table = register_sysctl_table(sysctls_root);

		if (!sysctls_root_table)

			return -ENOMEM;

#ifdef CONFIG_PROC_FS

		/*

		 * If the proc filesystem is in use and we are a module, need

		 * to set the owner of our proc entry to our module. In the

		 * non-modular case, THIS_MODULE is NULL, so this is ok.

		 */

		ntfs_sysctls[0].de->owner = THIS_MODULE;

#endif

	} else {

		BUG_ON(!sysctls_root_table);

		unregister_sysctl_table(sysctls_root_table);

include/linux/sysctl.h

+0 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,6 @@ struct ctl_table 
	ctl_table *parent;		/* Automatically set */

	proc_handler *proc_handler;	/* Callback for text formatting */

	ctl_handler *strategy;		/* Callback function for all r/w */

	struct proc_dir_entry *de;	/* /proc control block */

	void *extra1;

	void *extra2;

};

net/decnet/dn_dev.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

net/ipv4/devinet.c

+0 −5
Original line number Diff line number Diff line
@@ -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)

net/ipv6/addrconf.c

+0 −5
Original line number Diff line number Diff line
@@ -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)