[PATCH 2/2] - net/socket.c::__sock_create() cleanup.

[Luiz Fernando N. Capitulino]

 Hi,

 The 'i' variable in net/socket.c::__sock_create() is not
necessary. It's have been used to store error codes but there is
an 'err' variable already.

 The patch bellow removes the extra variable, and makes use
of 'err' istead.

 Agains't 2.6.10-rc2.


Signed-off-by: Luiz Capitulino <lcapitulino@xxxxxxxxxxxxxxxx>

 net/socket.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)


diff -X /home/lcapitulino/kernels/2.6/dontdiff -Nparu a/net/socket.c a~/net/socket.c
--- a/net/socket.c	2004-08-14 02:36:45.000000000 -0300
+++ a~/net/socket.c	2004-10-30 23:44:34.000000000 -0200
@@ -1073,7 +1073,6 @@ int sock_wake_async(struct socket *sock,
 
 static int __sock_create(int family, int type, int protocol, struct socket **res, int kern)
 {
-	int i;
 	int err;
 	struct socket *sock;
 
@@ -1118,7 +1117,7 @@ static int __sock_create(int family, int
 
 	net_family_read_lock();
 	if (net_families[family] == NULL) {
-		i = -EAFNOSUPPORT;
+		err = -EAFNOSUPPORT;
 		goto out;
 	}
 
@@ -1131,7 +1130,7 @@ static int __sock_create(int family, int
 	if (!(sock = sock_alloc())) 
 	{
 		printk(KERN_WARNING "socket: no more sockets\n");
-		i = -ENFILE;		/* Not exactly a match, but its the
+		err = -ENFILE;		/* Not exactly a match, but its the
 					   closest posix thing */
 		goto out;
 	}
@@ -1142,11 +1141,11 @@ static int __sock_create(int family, int
 	 * We will call the ->create function, that possibly is in a loadable
 	 * module, so we have to bump that loadable module refcnt first.
 	 */
-	i = -EAFNOSUPPORT;
+	err = -EAFNOSUPPORT;
 	if (!try_module_get(net_families[family]->owner))
 		goto out_release;
 
-	if ((i = net_families[family]->create(sock, protocol)) < 0)
+	if ((err = net_families[family]->create(sock, protocol)) < 0)
 		goto out_module_put;
 	/*
 	 * Now to bump the refcnt of the [loadable] module that owns this
@@ -1166,7 +1165,7 @@ static int __sock_create(int family, int
 
 out:
 	net_family_read_unlock();
-	return i;
+	return err;
 out_module_put:
 	module_put(net_families[family]->owner);
 out_release:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/