diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2019-04-10 14:12:44 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2019-04-10 14:12:44 -0400 |
commit | ad7999cd701e4e058765d35cf5274ee16801e986 (patch) | |
tree | 61e746c47dc7da004eeafd279d24b31dfc536d31 /fs | |
parent | 15ade5d2e7775667cf191cf2f94327a4889f8b9d (diff) | |
parent | f51dcd0f621caac5380ce90fbbeafc32ce4517ae (diff) | |
download | linux-stable-ad7999cd701e4e058765d35cf5274ee16801e986.tar.gz linux-stable-ad7999cd701e4e058765d35cf5274ee16801e986.tar.bz2 linux-stable-ad7999cd701e4e058765d35cf5274ee16801e986.zip |
Merge branch 'fixes' into work.icache
Diffstat (limited to 'fs')
-rw-r--r-- | fs/aio.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1034,7 +1034,7 @@ static inline struct aio_kiocb *aio_get_req(struct kioctx *ctx) return NULL; if (unlikely(!get_reqs_available(ctx))) { - kfree(req); + kmem_cache_free(kiocb_cachep, req); return NULL; } @@ -1794,7 +1794,7 @@ static int __io_submit_one(struct kioctx *ctx, const struct iocb *iocb, */ eventfd = eventfd_ctx_fdget(iocb->aio_resfd); if (IS_ERR(eventfd)) - return PTR_ERR(req->ki_eventfd); + return PTR_ERR(eventfd); req->ki_eventfd = eventfd; } |