deal with get_reqs_available() in aio_get_req() itself

simplifies the caller

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/aio.c b/fs/aio.c
index d3837f607d098cae06e3a0eeaedb0c03e8b23135..eee4b4cfb66fe00de7b2e9f9b8ec8822035f309d 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1033,6 +1033,11 @@ static inline struct aio_kiocb *aio_get_req(struct kioctx *ctx)
        if (unlikely(!req))
                return NULL;
 
+       if (unlikely(!get_reqs_available(ctx))) {
+               kfree(req);
+               return NULL;
+       }
+
        percpu_ref_get(&ctx->reqs);
        req->ki_ctx = ctx;
        INIT_LIST_HEAD(&req->ki_list);
@@ -1793,13 +1798,9 @@ static int __io_submit_one(struct kioctx *ctx, const struct iocb *iocb,
                return -EINVAL;
        }
 
-       if (!get_reqs_available(ctx))
-               return -EAGAIN;
-
-       ret = -EAGAIN;
        req = aio_get_req(ctx);
        if (unlikely(!req))
-               goto out_put_reqs_available;
+               return -EAGAIN;
 
        req->ki_filp = fget(iocb->aio_fildes);
        ret = -EBADF;
@@ -1874,7 +1875,6 @@ static int __io_submit_one(struct kioctx *ctx, const struct iocb *iocb,
 
 out_put_req:
        iocb_destroy(req);
-out_put_reqs_available:
        put_reqs_available(ctx, 1);
        return ret;
 }