From patchwork Fri Dec 7 22:19:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10718853 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DBBF81750 for ; Fri, 7 Dec 2018 22:20:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB2252F719 for ; Fri, 7 Dec 2018 22:20:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEFEB2F72F; Fri, 7 Dec 2018 22:20:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74F042F719 for ; Fri, 7 Dec 2018 22:20:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726139AbeLGWUf (ORCPT ); Fri, 7 Dec 2018 17:20:35 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:43809 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726135AbeLGWUf (ORCPT ); Fri, 7 Dec 2018 17:20:35 -0500 Received: by mail-pl1-f193.google.com with SMTP id gn14so2418802plb.10 for ; Fri, 07 Dec 2018 14:20:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=er4XNTBrDyS5t2gvWJtJjpkVFpAPOC78sIXCy9gEMJ4=; b=EDmQ/OxYLLqNzUokUrsNdKb8Phl575uEIHuKF/MdO/zmFqMbe3+HIKPktivzMZfmq+ 0FjGmJcRPa4zQB7zhKfk0dVxmdsyYBwZVGXvt9sAwbTU/oj2vHxvOeZ6ADcrcWWHkMDv jTGWqcKtdQq5flsOAuFJPKq+IP+s9Hr0bA/Z7SGOFOmmqHCAc3PyV/gzMQDyJdbSJQlw GJXFM6tuvDuIjHAvoZmWYFOx10bVqvBk9Rf7oSyMh/RVBrW3kWkypgETSV12F9WchLYM R13pvbJaEFEPzAHlql+EVhweUWoQFEX0gPAVW/nsq9lCHkLeV+Dt6uZ69DhhHIAcUVqk dD8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=er4XNTBrDyS5t2gvWJtJjpkVFpAPOC78sIXCy9gEMJ4=; b=FIuAHXqut9tyPBeffak+MjzyHh2IVo80BAVzXr0HsWNGhfu3wj8vJJLbFjuI9CgUCm WRDVGPMS1kNDFBA0kG8VBa4bcWGRb1imHXJXuMM4GWQtL/syU/yDodvl3qnqOL7W1BQZ oYelMFfOONmHRIiyTDO1eejjAnFIXfEYwM+grj2YQz+xctUjPoXlrA5xmgCU9ZtouyXj jMLkb37sfLI7fDR/AempAE6VWg+tPLhe8z6HinrMPD6zZVmU1izlOMoBycar8/QyK/0v PPZMOCQrHFbexcUCzUX3b5L72KeP8yjT7X0QrYnGXPEu0JLcAkqoeD+Vt+O2qbb4oCuI Vrow== X-Gm-Message-State: AA+aEWaiKvQwLkMD910ZJmwVT3p5wVddKQfjYddizUCERE4V0m5hpiJB BcB+I+Txktz9O0PGFlED9DXYW4QLm4k= X-Google-Smtp-Source: AFSGD/WvkI1dtS+ZD1xths86jtHnF8YACme2Jv4mmSrxPuRuPvMfeBGklT56Lp04yvxx91TLssnu9g== X-Received: by 2002:a17:902:8541:: with SMTP id d1mr3870976plo.205.1544221234616; Fri, 07 Dec 2018 14:20:34 -0800 (PST) Received: from x1.localdomain (66.29.188.166.static.utbb.net. [66.29.188.166]) by smtp.gmail.com with ESMTPSA id e9sm5282511pff.5.2018.12.07.14.20.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Dec 2018 14:20:33 -0800 (PST) From: Jens Axboe 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 Subject: [PATCH 06/26] aio: use assigned completion handler Date: Fri, 7 Dec 2018 15:19:56 -0700 Message-Id: <20181207222016.29387-7-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207222016.29387-1-axboe@kernel.dk> References: <20181207222016.29387-1-axboe@kernel.dk> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We know this is a read/write request, but in preparation for having different kinds of those, ensure that we call the assigned handler instead of assuming it's aio_complete_rq(). Reviewed-by: Christoph Hellwig Signed-off-by: Jens Axboe --- fs/aio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/aio.c b/fs/aio.c index 05647d352bf3..cf0de61743e8 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1490,7 +1490,7 @@ static inline void aio_rw_done(struct kiocb *req, ssize_t ret) ret = -EINTR; /*FALLTHRU*/ default: - aio_complete_rw(req, ret, 0); + req->ki_complete(req, ret, 0); } }