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

[linux-2.6-omap-h63xx.git] / net / rxrpc / ar-transport.c

diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
index 9b4e5cb545d2036a15c28eee520c2874fae13c18..64069c8769a51e0ad629d377d79f847dd26a92d7 100644 (file)
--- a/net/rxrpc/ar-transport.c
+++ b/net/rxrpc/ar-transport.c
@@ -183,13 +183,14 @@ void rxrpc_put_transport(struct rxrpc_transport *trans)
 
        ASSERTCMP(atomic_read(&trans->usage), >, 0);
 
-       trans->put_time = xtime.tv_sec;
-       if (unlikely(atomic_dec_and_test(&trans->usage)))
+       trans->put_time = get_seconds();
+       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 */
-               schedule_delayed_work(&rxrpc_transport_reap, 0);
+               rxrpc_queue_delayed_work(&rxrpc_transport_reap, 0);
+       }
        _leave("");
 }
 
@@ -219,7 +220,7 @@ static void rxrpc_transport_reaper(struct work_struct *work)
 
        _enter("");
 
-       now = xtime.tv_sec;
+       now = get_seconds();
        earliest = ULONG_MAX;
 
        /* extract all the transports that have been dead too long */
@@ -243,8 +244,8 @@ static void rxrpc_transport_reaper(struct work_struct *work)
        if (earliest != ULONG_MAX) {
                _debug("reschedule reaper %ld", (long) earliest - now);
                ASSERTCMP(earliest, >, now);
-               schedule_delayed_work(&rxrpc_transport_reap,
-                                     (earliest - now) * HZ);
+               rxrpc_queue_delayed_work(&rxrpc_transport_reap,
+                                        (earliest - now) * HZ);
        }
 
        /* then destroy all those pulled out */
@@ -270,7 +271,7 @@ void __exit rxrpc_destroy_all_transports(void)
 
        rxrpc_transport_timeout = 0;
        cancel_delayed_work(&rxrpc_transport_reap);
-       schedule_delayed_work(&rxrpc_transport_reap, 0);
+       rxrpc_queue_delayed_work(&rxrpc_transport_reap, 0);
 
        _leave("");
 }