From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA96CC282E1 for ; Wed, 24 Apr 2019 14:41:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8EDE421902 for ; Wed, 24 Apr 2019 14:41:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556116896; bh=vODwICpja33tZpJBW9fJ9F+BkFTPWSZ1vsblXdC4KKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HFDs7d0WXt9D3CDG5dS3A38D6IbehhDErEkVuiQQKMLRgQc1Li7AiS7efgU0Loq7E sdqtqL0SXTiW1omT8tdeYsZtYHhnFUY+Qv6XGSNZ2u3IU6mhQ9jh7vdu7loFxlgee2 evErtgYCXQ3pXBnsNAPy6WVkR/YSfKSXGz+0frEk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732126AbfDXOlg (ORCPT ); Wed, 24 Apr 2019 10:41:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:43900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732112AbfDXOle (ORCPT ); Wed, 24 Apr 2019 10:41:34 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E949721906; Wed, 24 Apr 2019 14:41:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556116894; bh=vODwICpja33tZpJBW9fJ9F+BkFTPWSZ1vsblXdC4KKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zu8FTkXfxxdkXnAK7IZRvRNQX7nuaCke7QKoiYaTyQ9TxmIs4HIibe6xw6u75/6MK bBcdG4i0eixgFfStHZQrwgFyvzC8zPX4jC6IwM2XkCzCXriTeI3efrM/dwwrD50nmK x0cuV1tgovSxDi98QOVHzggrCXYUwUatwYYedspg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Al Viro , Sasha Levin , linux-fsdevel@vger.kernel.org, linux-aio@kvack.org Subject: [PATCH AUTOSEL 4.19 52/52] aio: fold lookup_kiocb() into its sole caller Date: Wed, 24 Apr 2019 10:39:10 -0400 Message-Id: <20190424143911.28890-52-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190424143911.28890-1-sashal@kernel.org> References: <20190424143911.28890-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro [ Upstream commit 833f4154ed560232120bc475935ee1d6a20e159f ] Signed-off-by: Al Viro Signed-off-by: Sasha Levin --- fs/aio.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index 45d5ef8dd0a8..9c3115fa4c71 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1973,24 +1973,6 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat_aio_context_t, ctx_id, } #endif -/* lookup_kiocb - * Finds a given iocb for cancellation. - */ -static struct aio_kiocb * -lookup_kiocb(struct kioctx *ctx, struct iocb __user *iocb) -{ - struct aio_kiocb *kiocb; - - assert_spin_locked(&ctx->ctx_lock); - - /* TODO: use a hash or array, this sucks. */ - list_for_each_entry(kiocb, &ctx->active_reqs, ki_list) { - if (kiocb->ki_user_iocb == iocb) - return kiocb; - } - return NULL; -} - /* sys_io_cancel: * Attempts to cancel an iocb previously passed to io_submit. If * the operation is successfully cancelled, the resulting event is @@ -2019,10 +2001,13 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb, return -EINVAL; spin_lock_irq(&ctx->ctx_lock); - kiocb = lookup_kiocb(ctx, iocb); - if (kiocb) { - ret = kiocb->ki_cancel(&kiocb->rw); - list_del_init(&kiocb->ki_list); + /* TODO: use a hash or array, this sucks. */ + list_for_each_entry(kiocb, &ctx->active_reqs, ki_list) { + if (kiocb->ki_user_iocb == iocb) { + ret = kiocb->ki_cancel(&kiocb->rw); + list_del_init(&kiocb->ki_list); + break; + } } spin_unlock_irq(&ctx->ctx_lock); -- 2.19.1