diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-05-02 16:20:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-02 16:20:10 -0700 |
| commit | 50aab54f3056ba28afc681f71adee41c399dde1e (patch) | |
| tree | ad11e9d15abadaf51ca01105802c97f08fdfec94 | |
| parent | 78e92b99ec4eb73755abd4e357b0b211eadafd88 (diff) | |
| download | kernel_samsung_tuna-50aab54f3056ba28afc681f71adee41c399dde1e.zip kernel_samsung_tuna-50aab54f3056ba28afc681f71adee41c399dde1e.tar.gz kernel_samsung_tuna-50aab54f3056ba28afc681f71adee41c399dde1e.tar.bz2 | |
net: Add missing braces to multi-statement if()s
One finds all kinds of crazy things with some shell pipelining.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/sock.c | 3 | ||||
| -rw-r--r-- | 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(""); } |