[PATCH 04/11] sched/wait,afs: Replace wait_on_atomic_t usage

[Peter Zijlstra]

Convert the wait_on_atomic_t() usage to the new wait_var_event() API.

Cc: David Howells <dhowe...@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
---
 fs/afs/cell.c   |    6 +++---
 fs/afs/rxrpc.c  |    6 +++---
 fs/afs/server.c |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

--- a/fs/afs/cell.c
+++ b/fs/afs/cell.c
@@ -25,7 +25,7 @@ static void afs_manage_cell(struct work_
 static void afs_dec_cells_outstanding(struct afs_net *net)
 {
        if (atomic_dec_and_test(&net->cells_outstanding))
-               wake_up_atomic_t(&net->cells_outstanding);
+               wake_up_var(&net->cells_outstanding);
 }
 
 /*
@@ -764,7 +764,7 @@ void afs_cell_purge(struct afs_net *net)
        afs_queue_cell_manager(net);
 
        _debug("wait");
-       wait_on_atomic_t(&net->cells_outstanding, atomic_t_wait,
-                        TASK_UNINTERRUPTIBLE);
+       wait_var_event(&net->cells_outstanding,
+                      !atomic_read(&net->cells_outstanding));
        _leave("");
 }
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -103,8 +103,8 @@ void afs_close_socket(struct afs_net *ne
        }
 
        _debug("outstanding %u", atomic_read(&net->nr_outstanding_calls));
-       wait_on_atomic_t(&net->nr_outstanding_calls, atomic_t_wait,
-                        TASK_UNINTERRUPTIBLE);
+       wait_var_event(&net->nr_outstanding_calls,
+                      !atomic_read(&net->nr_outstanding_calls));
        _debug("no outstanding calls");
 
        kernel_sock_shutdown(net->socket, SHUT_RDWR);
@@ -175,7 +175,7 @@ void afs_put_call(struct afs_call *call)
                trace_afs_call(call, afs_call_trace_free, 0, o,
                               __builtin_return_address(0));
                if (o == 0)
-                       wake_up_atomic_t(&net->nr_outstanding_calls);
+                       wake_up_var(&net->nr_outstanding_calls);
        }
 }
 
--- a/fs/afs/server.c
+++ b/fs/afs/server.c
@@ -25,7 +25,7 @@ static void afs_inc_servers_outstanding(
 static void afs_dec_servers_outstanding(struct afs_net *net)
 {
        if (atomic_dec_and_test(&net->servers_outstanding))
-               wake_up_atomic_t(&net->servers_outstanding);
+               wake_up_var(&net->servers_outstanding);
 }
 
 /*
@@ -521,8 +521,8 @@ void afs_purge_servers(struct afs_net *n
        afs_queue_server_manager(net);
 
        _debug("wait");
-       wait_on_atomic_t(&net->servers_outstanding, atomic_t_wait,
-                        TASK_UNINTERRUPTIBLE);
+       wait_var_event(&net->servers_outstanding,
+                      !atomic_read(&net->servers_outstanding));
        _leave("");
 }