diff options
| author | Gu Zheng <guz.fnst@cn.fujitsu.com> | 2013-12-04 18:19:06 +0800 |
|---|---|---|
| committer | Benjamin LaHaise <bcrl@kvack.org> | 2013-12-06 10:22:55 -0500 |
| commit | d1b9432712a25eeb06114fb4b587133525a47de5 (patch) | |
| tree | 6bf2e051cdb49ca640340caf3f14b30a5a3a38ab /fs/aio.c | |
| parent | ddb8c45ba15149ebd41d7586261c05f7ca37f9a1 (diff) | |
| download | talos-obmc-linux-d1b9432712a25eeb06114fb4b587133525a47de5.tar.gz talos-obmc-linux-d1b9432712a25eeb06114fb4b587133525a47de5.zip | |
aio: clean up aio ring in the fail path
Clean up the aio ring file in the fail path of aio_setup_ring
and ioctx_alloc. And maybe it can fix the GPF issue reported by
Dave Jones:
https://lkml.org/lkml/2013/11/25/898
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
Diffstat (limited to 'fs/aio.c')
| -rw-r--r-- | fs/aio.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -316,8 +316,10 @@ static int aio_setup_ring(struct kioctx *ctx) if (nr_pages > AIO_RING_PAGES) { ctx->ring_pages = kcalloc(nr_pages, sizeof(struct page *), GFP_KERNEL); - if (!ctx->ring_pages) + if (!ctx->ring_pages) { + put_aio_ring_file(ctx); return -ENOMEM; + } } ctx->mmap_size = nr_pages * PAGE_SIZE; @@ -594,7 +596,7 @@ static struct kioctx *ioctx_alloc(unsigned nr_events) aio_nr + nr_events < aio_nr) { spin_unlock(&aio_nr_lock); err = -EAGAIN; - goto err; + goto err_ctx; } aio_nr += ctx->max_reqs; spin_unlock(&aio_nr_lock); @@ -611,6 +613,8 @@ static struct kioctx *ioctx_alloc(unsigned nr_events) err_cleanup: aio_nr_sub(ctx->max_reqs); +err_ctx: + aio_free_ring(ctx); err: free_percpu(ctx->cpu); free_percpu(ctx->reqs.pcpu_count); |
