[10/27] aio: use iocb_put() instead of open coding it

Message ID	20181211001549.30085-11-axboe@kernel.dk (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-block-owner@kernel.org> From: Jens Axboe <axboe@kernel.dk> To: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-aio@kvack.org Cc: hch@lst.de, jmoyer@redhat.com, clm@fb.com, Jens Axboe <axboe@kernel.dk> Subject: [PATCH 10/27] aio: use iocb_put() instead of open coding it Date: Mon, 10 Dec 2018 17:15:32 -0700 Message-Id: <20181211001549.30085-11-axboe@kernel.dk> In-Reply-To: <20181211001549.30085-1-axboe@kernel.dk> References: <20181211001549.30085-1-axboe@kernel.dk> Sender: linux-block-owner@vger.kernel.org Precedence: bulk
Series	[01/27] fs: add an iopoll method to struct file_operations \| expand [01/27] fs: add an iopoll method to struct file_operations [02/27] block: add REQ_HIPRI_ASYNC [03/27] block: wire up block device iopoll method [04/27] block: use REQ_HIPRI_ASYNC for non-sync polled IO [05/27] iomap: wire up the iopoll method [06/27] aio: use assigned completion handler [07/27] aio: separate out ring reservation from req allocation [08/27] aio: don't zero entire aio_kiocb aio_get_req() [09/27] aio: only use blk plugs for > 2 depth submissions [10/27] aio: use iocb_put() instead of open coding it [11/27] aio: split out iocb copy from io_submit_one() [12/27] aio: abstract out io_event filler helper [13/27] aio: add io_setup2() system call [14/27] aio: add support for having user mapped iocbs [15/27] aio: support for IO polling [16/27] aio: add submission side request cache [17/27] fs: add fget_many() and fput_many() [18/27] aio: use fget/fput_many() for file references [19/27] aio: split iocb init from allocation [20/27] aio: batch aio_kiocb allocation [21/27] block: add BIO_HOLD_PAGES flag [22/27] block: implement bio helper to add iter bvec pages to bio [23/27] fs: add support for mapping an ITER_BVEC for O_DIRECT [24/27] aio: add support for pre-mapped user IO buffers [25/27] aio: split old ring complete out from aio_complete() [26/27] aio: add support for submission/completion rings [27/27] aio: support kernel side submission for aio with SCQRING

Message ID

20181211001549.30085-11-axboe@kernel.dk (mailing list archive)

State

New, archived

Headers

From: Jens Axboe <axboe@kernel.dk>
To: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
        linux-aio@kvack.org
Cc: hch@lst.de, jmoyer@redhat.com, clm@fb.com,
        Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 10/27] aio: use iocb_put() instead of open coding it
Date: Mon, 10 Dec 2018 17:15:32 -0700
Message-Id: <20181211001549.30085-11-axboe@kernel.dk>
In-Reply-To: <20181211001549.30085-1-axboe@kernel.dk>
References: <20181211001549.30085-1-axboe@kernel.dk>
Sender: linux-block-owner@vger.kernel.org
Precedence: bulk

Series

[01/27] fs: add an iopoll method to struct file_operations | expand

Commit Message

Jens Axboe Dec. 11, 2018, 12:15 a.m. UTC

Replace the percpu_ref_put() + kmem_cache_free() with a call to
iocb_put() instead.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 fs/aio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/aio.c b/fs/aio.c
index ed6c3914477a..cf93b92bfb1e 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1884,10 +1884,9 @@  static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
 		goto out_put_req;
 	return 0;
 out_put_req:
-	percpu_ref_put(&ctx->reqs);
 	if (req->ki_eventfd)
 		eventfd_ctx_put(req->ki_eventfd);
-	kmem_cache_free(kiocb_cachep, req);
+	iocb_put(req);
 out_put_reqs_available:
 	put_reqs_available(ctx, 1);
 	return ret;

[10/27] aio: use iocb_put() instead of open coding it

Commit Message

Patch