Message ID | 20180117192742.710-7-hch@lst.de |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="Vnv07cGH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zMHVv2RsXz9t61 for <patchwork-incoming@ozlabs.org>; Thu, 18 Jan 2018 06:40:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753212AbeAQT2L (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Wed, 17 Jan 2018 14:28:11 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:39369 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753172AbeAQT2J (ORCPT <rfc822;netdev@vger.kernel.org>); Wed, 17 Jan 2018 14:28:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=5wX34j1Zx55MZAaz+9MZ83ZLFm2ZA+WBqUN8A7uW2U4=; b=Vnv07cGHdOT17fbB1Zaih1bFD Tj1dgkj7PcjjCiGd9q6bHO+J/3nRYPyKe4q7b+aX9/EoP4Xjd2DBc7EpPqTNC9da4jwWaX0gmGGoG AkeUvrrnPVSZv7+zMvlWp3U8DhvotWjTdITkyrp/TTfrNhAC9kgGW00ImVSnKbRC6x3TyiR5Pl7A1 FHs3z3gxX6dBz+cp8Mp/fKxpRNqYlKVuWMurjRR4whxlznps7A50h5pGQYslsGMTLYGWquP8c00Vu VN4ildup7hee2jGIC458APWn98nbtKmK8hdCOQwVNbpM4Gnqhxf7FaR0s79TralCQd7rS6nL6WMz2 NhMg7TuBg==; Received: from 77.117.185.35.wireless.dyn.drei.com ([77.117.185.35] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.89 #1 (Red Hat Linux)) id 1ebtNW-0002z8-Ka; Wed, 17 Jan 2018 19:28:07 +0000 From: Christoph Hellwig <hch@lst.de> To: viro@zeniv.linux.org.uk Cc: Avi Kivity <avi@scylladb.com>, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/36] aio: delete iocbs from the active_reqs list in kiocb_cancel Date: Wed, 17 Jan 2018 20:27:12 +0100 Message-Id: <20180117192742.710-7-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180117192742.710-1-hch@lst.de> References: <20180117192742.710-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from <hch@infradead.org> by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
[01/36] aio: don't print the page size at boot time
|
expand
|
diff --git a/fs/aio.c b/fs/aio.c index 2d40cf5dd4ec..0b6394b4e528 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -561,6 +561,8 @@ static int kiocb_cancel(struct aio_kiocb *kiocb) { kiocb_cancel_fn *cancel = kiocb->ki_cancel; + list_del_init(&kiocb->ki_list); + if (!cancel) return -EINVAL; kiocb->ki_cancel = NULL; @@ -607,8 +609,6 @@ static void free_ioctx_users(struct percpu_ref *ref) while (!list_empty(&ctx->active_reqs)) { req = list_first_entry(&ctx->active_reqs, struct aio_kiocb, ki_list); - - list_del_init(&req->ki_list); kiocb_cancel(req); }