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=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 2A45DC43219 for ; Tue, 30 Apr 2019 12:00:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA9DF21734 for ; Tue, 30 Apr 2019 12:00:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556625604; bh=D6qSe3zth6MXfbNV0n/iLso/fVj3UaFTCA6CWkO5eIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tMdSttQIijxYdCjr5U7xWGG/KyksoRgMDq6rZoxdTefu21Xajy71MQZ105tp66dHV uMosiqWjV+GdTE68bb8dTzAwX3FT4OFUjwnj0zmgFOaKBOwaTbjf+GbYMTKlmO0G8A 2fVUzvosAQTORD+PXjd2Li/I1qimAql9RbX1RSm4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727728AbfD3L76 (ORCPT ); Tue, 30 Apr 2019 07:59:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:59032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730499AbfD3LqP (ORCPT ); Tue, 30 Apr 2019 07:46:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 10FF820449; Tue, 30 Apr 2019 11:46:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624774; bh=D6qSe3zth6MXfbNV0n/iLso/fVj3UaFTCA6CWkO5eIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X3VLsPfGgN7DUhxcnSl0ZpX9ikpu26kwhwt5bF7ArQ2gXqR8JnUdEvMiHY8PEzR4Q SuPDrZLc3hpdT4aQh7nHCjHbgt3/aITfUJE/QJTggNdX25/Ugkw1qoAwaQZ/wMm6CR t89/p3eRINA60y7qWpcgAwx3oJlBxqf9qlihaE30= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christoph Hellwig , Jens Axboe , Guenter Roeck Subject: [PATCH 4.19 067/100] aio: use assigned completion handler Date: Tue, 30 Apr 2019 13:38:36 +0200 Message-Id: <20190430113611.948180261@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113608.616903219@linuxfoundation.org> References: <20190430113608.616903219@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jens Axboe commit bc9bff61624ac33b7c95861abea1af24ee7a94fc upstream. 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 Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- fs/aio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/aio.c +++ b/fs/aio.c @@ -1492,7 +1492,7 @@ static inline void aio_rw_done(struct ki ret = -EINTR; /*FALLTHRU*/ default: - aio_complete_rw(req, ret, 0); + req->ki_complete(req, ret, 0); } }