diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-20 21:27:57 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-31 22:03:15 +0200 |
| commit | a2e1859adb3b05fa99f87a67df9ef2a4b7b04a13 (patch) | |
| tree | 2d6ba3300b595f2db3fdb3407fc2d028a7baf68a | |
| parent | aio: merge aio_cancel_all() with wait_for_all_aios() (diff) | |
| download | linux-a2e1859adb3b05fa99f87a67df9ef2a4b7b04a13.tar.xz linux-a2e1859adb3b05fa99f87a67df9ef2a4b7b04a13.zip | |
aio: take final put_ioctx() into callers of io_destroy()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/aio.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -1270,7 +1270,6 @@ static void io_destroy(struct kioctx *ioctx) * locking done by the above calls to ensure this consistency. */ wake_up_all(&ioctx->wait); - put_ioctx(ioctx); /* once for the lookup */ } /* sys_io_setup: @@ -1307,11 +1306,9 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp) ret = PTR_ERR(ioctx); if (!IS_ERR(ioctx)) { ret = put_user(ioctx->user_id, ctxp); - if (!ret) { - put_ioctx(ioctx); - return 0; - } - io_destroy(ioctx); + if (ret) + io_destroy(ioctx); + put_ioctx(ioctx); } out: @@ -1329,6 +1326,7 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx) struct kioctx *ioctx = lookup_ioctx(ctx); if (likely(NULL != ioctx)) { io_destroy(ioctx); + put_ioctx(ioctx); return 0; } pr_debug("EINVAL: io_destroy: invalid context id\n"); |