summaryrefslogtreecommitdiffstats
path: root/fs/aio.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-03-11 00:58:40 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-20 21:29:39 -0400
commitbf50722a3c4a83aae651dc20b708308a4f119eb9 (patch)
tree08d4724ae2239d2d23040eae730ad7980f4a2299 /fs/aio.c
parent9fa1cb397fa052fc9acfaf5a9f2faff31e10f6b7 (diff)
downloadlinux-stable-bf50722a3c4a83aae651dc20b708308a4f119eb9.tar.gz
linux-stable-bf50722a3c4a83aae651dc20b708308a4f119eb9.tar.bz2
linux-stable-bf50722a3c4a83aae651dc20b708308a4f119eb9.zip
aio: use cancel_delayed_work_sync()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/aio.c')
-rw-r--r--fs/aio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 9c3de88e2ead..a92d7547b6f6 100644
--- a/fs/aio.c
+++ b/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;