lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IPV4]: Cleanup the devinet_sysctl_register

Browse Source 
I moved the call to kmalloc() from the *t declaration into
the code (this is confusing when a variable is initialized
with the result of some call) and removed unneeded comment
near the error path. Just like I did with the neigh ctl-s.

Besides, I fixed the goto's and the labels - they were indented
with spaces :(

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov
2007-12-02 00:17:46 +11:00
committed by David S. Miller
parent c3bac5a71b
commit 9fa8964299
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/ipv4/devinet.c
View File

@@ -1506,12 +1506,13 @@ static void devinet_sysctl_register(struct in_device *in_dev,
{ {
int i; int i;
struct net_device *dev = in_dev ? in_dev->dev : NULL; struct net_device *dev = in_dev ? in_dev->dev : NULL;
struct devinet_sysctl_table *t = kmemdup(&devinet_sysctl, sizeof(*t), struct devinet_sysctl_table *t;
GFP_KERNEL);
char *dev_name = NULL; char *dev_name = NULL;
t = kmemdup(&devinet_sysctl, sizeof(*t), GFP_KERNEL);
if (!t) if (!t)
return; goto out;
for (i = 0; i < ARRAY_SIZE(t->devinet_vars) - 1; i++) { 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].data += (char *)p - (char *)&ipv4_devconf;
t->devinet_vars[i].extra1 = p; t->devinet_vars[i].extra1 = p;
@@ -1532,7 +1533,7 @@ static void devinet_sysctl_register(struct in_device *in_dev,
*/ */
dev_name = kstrdup(dev_name, GFP_KERNEL); dev_name = kstrdup(dev_name, GFP_KERNEL);
if (!dev_name) if (!dev_name)
goto free; goto free;
t->devinet_dev[0].procname = dev_name; t->devinet_dev[0].procname = dev_name;
t->devinet_dev[0].child = t->devinet_vars; t->devinet_dev[0].child = t->devinet_vars;
@@ -1542,16 +1543,16 @@ static void devinet_sysctl_register(struct in_device *in_dev,
t->sysctl_header = register_sysctl_table(t->devinet_root_dir); t->sysctl_header = register_sysctl_table(t->devinet_root_dir);
if (!t->sysctl_header) if (!t->sysctl_header)
goto free_procname; goto free_procname;
p->sysctl = t; p->sysctl = t;
return; return;
/* error path */ free_procname:
free_procname:
kfree(dev_name); kfree(dev_name);
free: free:
kfree(t); kfree(t);
out:
return; return;
} }