OpenVZ Forum


Home » Mailing lists » Devel » [PATCH net-2.6.25 1/3][IPV4] Cleanup the devinet_sysctl_register
[PATCH net-2.6.25 1/3][IPV4] Cleanup the devinet_sysctl_register [message #24083] Fri, 30 November 2007 18:21 Go to next message
Pavel Emelianov is currently offline  Pavel Emelianov
Messages: 1149
Registered: September 2006
Senior Member
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>

---

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 1ae7dcf..34c34c6 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1507,12 +1507,13 @@ static void devinet_sysctl_register(struct in_device *in_dev,
 {
 	int i;
 	struct net_device *dev = in_dev ? in_dev->dev : NULL;
-	struct devinet_sysctl_table *t = kmemdup(&devinet_sysctl, sizeof(*t),
-						 GFP_KERNEL);
+	struct devinet_sysctl_table *t;
 	char *dev_name = NULL;
 
+	t = kmemdup(&devinet_sysctl, sizeof(*t), GFP_KERNEL);
 	if (!t)
-		return;
+		goto out;
+
 	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].extra1 = p;
@@ -1533,7 +1534,7 @@ static void devinet_sysctl_register(struct in_device *in_dev,
 	 */
 	dev_name = kstrdup(dev_name, GFP_KERNEL);
 	if (!dev_name)
-	    goto free;
+		goto free;
 
 	t->devinet_dev[0].procname    = dev_name;
 	t->devinet_dev[0].child	      = t->devinet_vars;
@@ -1543,16 +1544,16 @@ static void devinet_sysctl_register(struct in_device *in_dev,
 
 	t->sysctl_header = register_sysctl_table(t->devinet_root_dir);
 	if (!t->sysctl_header)
-	    goto free_procname;
+		goto free_procname;
 
 	p->sysctl = t;
 	return;
 
-	/* error path */
- free_procname:
+free_procname:
 	kfree(dev_name);
- free:
+free:
 	kfree(t);
+out:
 	return;
 }
 
-- 
1.5.3.4
Re: [PATCH net-2.6.25 1/3][IPV4] Cleanup the devinet_sysctl_register [message #24126 is a reply to message #24083] Sat, 01 December 2007 13:18 Go to previous message
Herbert Xu is currently offline  Herbert Xu
Messages: 45
Registered: April 2007
Member
On Fri, Nov 30, 2007 at 09:21:00PM +0300, Pavel Emelyanov wrote:
> 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>

Applied to net-2.6.25.  Thanks.
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Previous Topic: Re: namespace support requires network modules to say "GPL"
Next Topic: [PATCH net-2.6.25 2/3][IPV4] Unify and cleanup calls to devinet_sysctl_register
Goto Forum:
  


Current Time: Tue Oct 03 18:18:50 GMT 2023

Total time taken to generate the page: 0.02345 seconds