[PATCH] [NET]: Add missing braces to multi-statement if()s

[PATCH] [NET]: Add missing braces to multi-statement if()s

[Ilpo Järvinen]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1545 bytes --]


One finds all kinds of crazy things with some shell pipelining.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Cc: David Howells <dhowells@redhat.com>
---
 net/core/sock.c          |    3 ++-
 net/rxrpc/ar-transport.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/core/sock.c b/net/core/sock.c
index 5dbb81b..fa76f04 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -228,11 +228,12 @@ static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)
 		static int warned __read_mostly;
 
 		*timeo_p = 0;
-		if (warned < 10 && net_ratelimit())
+		if (warned < 10 && net_ratelimit()) {
 			warned++;
 			printk(KERN_INFO "sock_set_timeout: `%s' (pid %d) "
 			       "tries to set negative timeout\n",
 				current->comm, task_pid_nr(current));
+		}
 		return 0;
 	}
 	*timeo_p = MAX_SCHEDULE_TIMEOUT;
diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
index bb282a6..64069c8 100644
--- a/net/rxrpc/ar-transport.c
+++ b/net/rxrpc/ar-transport.c
@@ -184,12 +184,13 @@ void rxrpc_put_transport(struct rxrpc_transport *trans)
 	ASSERTCMP(atomic_read(&trans->usage), >, 0);
 
 	trans->put_time = get_seconds();
-	if (unlikely(atomic_dec_and_test(&trans->usage)))
+	if (unlikely(atomic_dec_and_test(&trans->usage))) {
 		_debug("zombie");
 		/* let the reaper determine the timeout to avoid a race with
 		 * overextending the timeout if the reaper is running at the
 		 * same time */
 		rxrpc_queue_delayed_work(&rxrpc_transport_reap, 0);
+	}
 	_leave("");
 }
 
-- 
1.5.2.2

Re: [PATCH] [NET]: Add missing braces to multi-statement if()s

[Arjan van de Ven]

On Fri, 2 May 2008 16:48:35 +0300 (EEST)
"Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi> wrote:

> 
> One finds all kinds of crazy things with some shell pipelining.

nice catches!

> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
> Cc: David Howells <dhowells@redhat.com>
> ---
>  net/core/sock.c          |    3 ++-
>  net/rxrpc/ar-transport.c |    3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/net/core/sock.c b/net/core/sock.c
> index 5dbb81b..fa76f04 100644
> --- a/net/core/sock.c
> +++ b/net/core/sock.c
> @@ -228,11 +228,12 @@ static int sock_set_timeout(long *timeo_p, char
> __user *optval, int optlen) static int warned __read_mostly;
>  
>  		*timeo_p = 0;
> -		if (warned < 10 && net_ratelimit())
> +		if (warned < 10 && net_ratelimit()) {
>  			warned++;
>  			printk(KERN_INFO "sock_set_timeout:
> `%s' (pid %d) " "tries to set negative timeout\n",
>  				current->comm, task_pid_nr(current));
> +		}
>  		return 0;
>  	}
>  	*timeo_p = MAX_SCHEDULE_TIMEOUT;
>
>  

oh my kingdom for a WARN_ON_ONCE() that acts like printk after the
first parameter....

Re: [PATCH] [NET]: Add missing braces to multi-statement if()s

[David Howells]

Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> wrote:

> One finds all kinds of crazy things with some shell pipelining.
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
> Cc: David Howells <dhowells@redhat.com>

Acked-by: David Howells <dhowells@redhat.com>

Re: [PATCH] [NET]: Add missing braces to multi-statement if()s

[David Miller]

From: David Howells <dhowells@redhat.com>
Date: Fri, 02 May 2008 15:15:36 +0100

> Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> wrote:
> 
> > One finds all kinds of crazy things with some shell pipelining.
> > 
> > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
> > Cc: David Howells <dhowells@redhat.com>
> 
> Acked-by: David Howells <dhowells@redhat.com>

Applied, good catch :)