mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
aio: don't bother with async freeing on failure in ioctx_alloc()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
5d026c7242
commit
e23754f880
1 changed files with 5 additions and 7 deletions
12
fs/aio.c
12
fs/aio.c
|
@ -248,6 +248,7 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
|
|||
struct mm_struct *mm;
|
||||
struct kioctx *ctx;
|
||||
int did_sync = 0;
|
||||
int err = -ENOMEM;
|
||||
|
||||
/* Prevent overflows */
|
||||
if ((nr_events > (0x10000000U / sizeof(struct io_event))) ||
|
||||
|
@ -310,16 +311,13 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
|
|||
return ctx;
|
||||
|
||||
out_cleanup:
|
||||
__put_ioctx(ctx);
|
||||
return ERR_PTR(-EAGAIN);
|
||||
|
||||
err = -EAGAIN;
|
||||
aio_free_ring(ctx);
|
||||
out_freectx:
|
||||
mmdrop(mm);
|
||||
kmem_cache_free(kioctx_cachep, ctx);
|
||||
ctx = ERR_PTR(-ENOMEM);
|
||||
|
||||
dprintk("aio: error allocating ioctx %p\n", ctx);
|
||||
return ctx;
|
||||
dprintk("aio: error allocating ioctx %d\n", err);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
/* aio_cancel_all
|
||||
|
|
Loading…
Reference in a new issue