From 30d2eb5f4d97337440b6b6019ba917e99628c5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Fri, 2 May 2008 16:20:10 -0700 Subject: [PATCH] --- yaml --- r: 95891 b: refs/heads/master c: 50aab54f3056ba28afc681f71adee41c399dde1e h: refs/heads/master i: 95889: 6a31f74bd3efabb9a0b0af85e35edda9eab5d597 95887: 21815fa66ec4cdaa76b54dd52854030d379f32ea v: v3 --- [refs] | 2 +- trunk/net/core/sock.c | 3 ++- trunk/net/rxrpc/ar-transport.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 787975d59e0d..3211a4d6d91f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78e92b99ec4eb73755abd4e357b0b211eadafd88 +refs/heads/master: 50aab54f3056ba28afc681f71adee41c399dde1e diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 5dbb81bc9673..fa76f04fa9c6 100644 --- a/trunk/net/core/sock.c +++ b/trunk/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/trunk/net/rxrpc/ar-transport.c b/trunk/net/rxrpc/ar-transport.c index bb282a6a19f0..64069c8769a5 100644 --- a/trunk/net/rxrpc/ar-transport.c +++ b/trunk/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(""); }