luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Add missing braces to multi-statement if()s

Browse Source 
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>
This commit is contained in:
Ilpo Järvinen 2008-05-02 16:20:10 -07:00 committed by David S. Miller
parent 78e92b99ec
commit 50aab54f30
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/core/sock.c
View File

@ -228,11 +228,12 @@ static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)
static int warned __read_mostly; static int warned __read_mostly;
*timeo_p = 0; *timeo_p = 0;
if (warned < 10 && net_ratelimit()) if (warned < 10 && net_ratelimit()) {
warned++; warned++;
printk(KERN_INFO "sock_set_timeout: `%s' (pid %d) " printk(KERN_INFO "sock_set_timeout: `%s' (pid %d) "
"tries to set negative timeout\n", "tries to set negative timeout\n",
current->comm, task_pid_nr(current)); current->comm, task_pid_nr(current));
}
return 0; return 0;
} }
*timeo_p = MAX_SCHEDULE_TIMEOUT; *timeo_p = MAX_SCHEDULE_TIMEOUT;

3
net/rxrpc/ar-transport.c
View File

@ -184,12 +184,13 @@ void rxrpc_put_transport(struct rxrpc_transport *trans)
ASSERTCMP(atomic_read(&trans->usage), >, 0); ASSERTCMP(atomic_read(&trans->usage), >, 0);
trans->put_time = get_seconds(); trans->put_time = get_seconds();
if (unlikely(atomic_dec_and_test(&trans->usage))) if (unlikely(atomic_dec_and_test(&trans->usage))) {
_debug("zombie"); _debug("zombie");
/* let the reaper determine the timeout to avoid a race with /* let the reaper determine the timeout to avoid a race with
* overextending the timeout if the reaper is running at the * overextending the timeout if the reaper is running at the
* same time */ * same time */
rxrpc_queue_delayed_work(&rxrpc_transport_reap, 0); rxrpc_queue_delayed_work(&rxrpc_transport_reap, 0);
}
_leave(""); _leave("");
} }