sched/wait, fs/nfs: Convert wait_on_atomic_t() usage to the new wait_var_event() API

The old wait_on_atomic_t() is going to get removed, use the more
flexible wait_var_event() API instead.

No change in functionality.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Anna Schumaker <anna.schumaker@netapp.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 7d893543cf3b37acdb7afe7ad423cecb63204697..d17a90c4fa3733495b9b81e08cc343fba2fc967f 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -85,11 +85,6 @@ int nfs_wait_bit_killable(struct wait_bit_key *key, int mode)
 }
 EXPORT_SYMBOL_GPL(nfs_wait_bit_killable);
 
-int nfs_wait_atomic_killable(atomic_t *p, unsigned int mode)
-{
-       return nfs_wait_killable(mode);
-}
-
 /**
  * nfs_compat_user_ino64 - returns the user-visible inode number
  * @fileid: 64-bit fileid

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 18a7626ac63801dcf96a0804f3963a963a4fc3e0..67d19cd92e44235d1c0ec81630efa79bd902616f 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -98,8 +98,8 @@ nfs_page_free(struct nfs_page *p)
 int
 nfs_iocounter_wait(struct nfs_lock_context *l_ctx)
 {
-       return wait_on_atomic_t(&l_ctx->io_count, nfs_wait_atomic_killable,
-                       TASK_KILLABLE);
+       return wait_var_event_killable(&l_ctx->io_count,
+                                      !atomic_read(&l_ctx->io_count));
 }
 
 /**
@@ -395,7 +395,7 @@ static void nfs_clear_request(struct nfs_page *req)
        }
        if (l_ctx != NULL) {
                if (atomic_dec_and_test(&l_ctx->io_count)) {
-                       wake_up_atomic_t(&l_ctx->io_count);
+                       wake_up_var(&l_ctx->io_count);
                        if (test_bit(NFS_CONTEXT_UNLOCK, &ctx->flags))
                                rpc_wake_up(&NFS_SERVER(d_inode(ctx->dentry))->uoc_rpcwaitq);
                }

diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c
index 03aaa60c7768a087ed99bd381fa299161dc9716d..32ba2d47185303419270acf6891fc28ead9f8e8e 100644 (file)
--- a/fs/nfs/pnfs_nfs.c
+++ b/fs/nfs/pnfs_nfs.c
@@ -245,7 +245,7 @@ pnfs_generic_commit_cancel_empty_pagelist(struct list_head *pages,
 {
        if (list_empty(pages)) {
                if (atomic_dec_and_test(&cinfo->mds->rpcs_out))
-                       wake_up_atomic_t(&cinfo->mds->rpcs_out);
+                       wake_up_var(&cinfo->mds->rpcs_out);
                /* don't call nfs_commitdata_release - it tries to put
                 * the open_context which is not acquired until nfs_init_commit
                 * which has not been called on @data */

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 7428a669d7a77b5fd82a7b8da348308ac058d155..fd805771ea2f980794cc3a4b4be3e796e3b8a3cf 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1620,8 +1620,8 @@ static void nfs_writeback_result(struct rpc_task *task,
 
 static int wait_on_commit(struct nfs_mds_commit_info *cinfo)
 {
-       return wait_on_atomic_t(&cinfo->rpcs_out,
-                       nfs_wait_atomic_killable, TASK_KILLABLE);
+       return wait_var_event_killable(&cinfo->rpcs_out,
+                                      !atomic_read(&cinfo->rpcs_out));
 }
 
 static void nfs_commit_begin(struct nfs_mds_commit_info *cinfo)
@@ -1632,7 +1632,7 @@ static void nfs_commit_begin(struct nfs_mds_commit_info *cinfo)
 static void nfs_commit_end(struct nfs_mds_commit_info *cinfo)
 {
        if (atomic_dec_and_test(&cinfo->rpcs_out))
-               wake_up_atomic_t(&cinfo->rpcs_out);
+               wake_up_var(&cinfo->rpcs_out);
 }
 
 void nfs_commitdata_release(struct nfs_commit_data *data)