aboutsummaryrefslogtreecommitdiffstats
path: root/fs/aio.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/aio.c')
-rw-r--r--fs/aio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 67e4b9047cc9..f6578cb22d00 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -273,7 +273,7 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
273 mm = ctx->mm = current->mm; 273 mm = ctx->mm = current->mm;
274 atomic_inc(&mm->mm_count); 274 atomic_inc(&mm->mm_count);
275 275
276 atomic_set(&ctx->users, 1); 276 atomic_set(&ctx->users, 2);
277 spin_lock_init(&ctx->ctx_lock); 277 spin_lock_init(&ctx->ctx_lock);
278 spin_lock_init(&ctx->ring_info.ring_lock); 278 spin_lock_init(&ctx->ring_info.ring_lock);
279 init_waitqueue_head(&ctx->wait); 279 init_waitqueue_head(&ctx->wait);
@@ -1338,10 +1338,10 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp)
1338 ret = PTR_ERR(ioctx); 1338 ret = PTR_ERR(ioctx);
1339 if (!IS_ERR(ioctx)) { 1339 if (!IS_ERR(ioctx)) {
1340 ret = put_user(ioctx->user_id, ctxp); 1340 ret = put_user(ioctx->user_id, ctxp);
1341 if (!ret) 1341 if (!ret) {
1342 put_ioctx(ioctx);
1342 return 0; 1343 return 0;
1343 1344 }
1344 get_ioctx(ioctx); /* io_destroy() expects us to hold a ref */
1345 io_destroy(ioctx); 1345 io_destroy(ioctx);
1346 } 1346 }
1347 1347