Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp770621imm; Wed, 20 Jun 2018 06:23:50 -0700 (PDT) X-Google-Smtp-Source: ADUXVKINq1TANwjoyoExtYQ5V+73dDQ7OywaNfeJhKc3chi2jDbOneZNmmM5NEUhDTuFxgTdl9ln X-Received: by 2002:a62:6710:: with SMTP id b16-v6mr23046479pfc.37.1529501030072; Wed, 20 Jun 2018 06:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529501030; cv=none; d=google.com; s=arc-20160816; b=QhyxY5xAt/Cgpdu4qpRfsV6MbA4t7U5UxfOye1sm3F9mOtL1+HfGvuSIocO2K1f4qr LHKshgoumu0XNATAOt1pv1p0QvQ+eEkMxTfgN93or7XjQkTAmKQqskRV44k8IJoffTu+ TvydiLo7izQ1I3MvkazjLu54iJySv1n9jOljddnuUGMRf6GKVR8BUVftOFL3yd/+x4NV 5pAgtyDcVz+kjeqwGhV8gGTKVr/P+EP2cTqdRjRBJaxBgoXu0pPWCphWQ/+SVpikmPV/ nQ5FA0Y66DL0nUcoOFvKaotbL19hdkfhU26G7+tHSeI8TQKpE5+ivGlBz5DE0bvZ+aFX xR7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=WkPfBK6FN89TPu2hdEVq9QSFXvxPg0BFnBWwHprjodE=; b=MA70bbIeQ17iAB8Fy7JYUIUaESzNzBRXzv7NkCrs629HXhHqNdo4gONqgmEOocOejN 5FRbsQyKrlCjaYEC9uYLmQPwdepp0jLRpSSfO7gW8OXd/j35HRKFmbdygHP7lRNQ0DYK YPPW0r/Vw+5Y7fVnZcg77/cMPbBc5KR0EJ6AGu2liAR6g4GAyBqQ4W26YWxDxqXULbDK TZq9LlCM8Z0TmmhD/8EW6jKdOuLIAFwg4Qu+LWdpCORolI+q+mqMtPcpDF0o7q4Gohcm HjTjXm8BnROnkWyX27Ols4xyIrTSI/7U6yp8YKhxINU9eEKCX/BViYIgMTzxqXRGnSv2 TQow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=JUzyrf6G; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l64-v6si2019103pgd.174.2018.06.20.06.23.36; Wed, 20 Jun 2018 06:23:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=JUzyrf6G; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932368AbeFTNWm (ORCPT + 99 others); Wed, 20 Jun 2018 09:22:42 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:47414 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753880AbeFTNWY (ORCPT ); Wed, 20 Jun 2018 09:22:24 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5KDELAT063547; Wed, 20 Jun 2018 13:22:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=WkPfBK6FN89TPu2hdEVq9QSFXvxPg0BFnBWwHprjodE=; b=JUzyrf6GQfjCq4+WSA5ZplA/IdBdX5tuOREPyZpB014TTmuVSKD8/XD5ZWdw4PcXl8cr loOWZLiqfRPZ/kpSlnCAGK1WauAKEIX3f8JsDMof5dpTZVn1HS+mYCym5LNanw0W7hAu LyAL2qb3uoHY4TdWgus/VErZxHKn3oj5o3lGws80dqmpGc19y8+NB0qviyvhyjRfeTZj e1Sf16+jS3a74bTOIy6zCxiaqQXxcRW9hd3UVXDMtoBTOsfn2ox+dVh/HT5w9Xlu/uxp fIp2TvkvJr2+jyDmoXoetAlPBysxv2d5elUwP0OfbKdkuyeR2eO3hPECpIfRm8SJZo5x dA== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2120.oracle.com with ESMTP id 2jmu6xvcy2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Jun 2018 13:22:14 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w5KDMD0k032629 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Jun 2018 13:22:13 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w5KDMC6e029815; Wed, 20 Jun 2018 13:22:13 GMT Received: from will-ThinkCentre-M910s.cn.oracle.com (/10.182.70.254) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 20 Jun 2018 06:22:12 -0700 From: Jianchao Wang To: axboe@kernel.dk, hch@lst.de, martin.petersen@oracle.com, keith.busch@intel.com, josef@toxicpanda.com, ulf.hansson@linaro.org Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] mmc: use __blk_mq_complete_request in timeout path Date: Wed, 20 Jun 2018 21:22:43 +0800 Message-Id: <1529500964-28429-5-git-send-email-jianchao.w.wang@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529500964-28429-1-git-send-email-jianchao.w.wang@oracle.com> References: <1529500964-28429-1-git-send-email-jianchao.w.wang@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8929 signatures=668702 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=936 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806200150 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To regain the capability to prevent normal completion path from entering a timeout request, blk_mq_mark_rq_complete is introduced in blk_mq_complete_request. Have to use __blk_mq_complete_request in timeout path to complete a timeout request. Signed-off-by: Jianchao Wang --- drivers/mmc/core/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index 648eb67..43dcd7a 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -112,7 +112,7 @@ static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req) return BLK_EH_RESET_TIMER; } /* No timeout (XXX: huh? comment doesn't make much sense) */ - blk_mq_complete_request(req); + __blk_mq_complete_request(req); return BLK_EH_DONE; default: /* Timeout is handled by mmc core */ -- 2.7.4