1 files changed, 3 insertions, 3 deletions

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index e7d8ceae8f26..6579f3b367bd 100644
--- 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)