---

yaml --- r: 292339 b: refs/heads/master c: bf50722 h: refs/heads/master i: 292337: 53f3414 292335: 7f0802c v: v3
git-mirror · Mar 21, 2012 · ab98ef0 · ab98ef0
1 parent 753e0cb
commit ab98ef0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;