From ab98ef093efde1e121565c86e6040bbd7a243e01 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 11 Mar 2012 00:58:40 -0500
Subject: [PATCH] --- yaml --- r: 292339 b: refs/heads/master c:
 bf50722a3c4a83aae651dc20b708308a4f119eb9 h: refs/heads/master i:   292337:
 53f341452c4f03ceb2328cd4d31313007cd99015   292335:
 7f0802ca1b5a389a969ee35bd8e5a2b79bb4ac58 v: v3

---
 [refs]         | 2 +-
 trunk/fs/aio.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 39452804c3f8..5dbbcd3b41e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fa1cb397fa052fc9acfaf5a9f2faff31e10f6b7
+refs/heads/master: bf50722a3c4a83aae651dc20b708308a4f119eb9
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
index 9c3de88e2ead..a92d7547b6f6 100644
--- a/trunk/fs/aio.c
+++ b/trunk/fs/aio.c
@@ -211,8 +211,7 @@ static void __put_ioctx(struct kioctx *ctx)
 	unsigned nr_events = ctx->max_reqs;
 	BUG_ON(ctx->reqs_active);
 
-	cancel_delayed_work(&ctx->wq);
-	cancel_work_sync(&ctx->wq.work);
+	cancel_delayed_work_sync(&ctx->wq);
 	aio_free_ring(ctx);
 	mmdrop(ctx->mm);
 	ctx->mm = NULL;