aboutsummaryrefslogtreecommitdiff
path: root/fs/aio.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-04-20 13:51:21 +0800
committerAlex Shi <alex.shi@linaro.org>2015-04-20 13:51:21 +0800
commit663276faa26c2837eca83a5800b3668be19aaaff (patch)
treeaee6a1964c83eb2153bde4a4c442af88204a28a8 /fs/aio.c
parent667ea3959654ae48ef303df13f2635fd07766cb4 (diff)
parent5c43c539346972b9a1d5f38dc62db5a39997488d (diff)
downloadlinux-linaro-stable-663276faa26c2837eca83a5800b3668be19aaaff.tar.gz
Merge tag 'v3.14.39' into linux-linaro-lsk-v3.14
This is the 3.14.39 stable release
Diffstat (limited to 'fs/aio.c')
-rw-r--r--fs/aio.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 2f7e8c2e3e76..3241659491b1 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -719,6 +719,9 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
err_cleanup:
aio_nr_sub(ctx->max_reqs);
err_ctx:
+ atomic_set(&ctx->dead, 1);
+ if (ctx->mmap_size)
+ vm_munmap(ctx->mmap_base, ctx->mmap_size);
aio_free_ring(ctx);
err:
mutex_unlock(&ctx->ring_lock);