Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp770535imm; Wed, 20 Jun 2018 06:23:44 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKp1WiDC1uA1FB1y1NqAkTbZ7MTsgxqWfFyBOrxL7GDUw1YtaO56ZoX7j0sIF32d30ofrSz X-Received: by 2002:a17:902:6903:: with SMTP id j3-v6mr23405673plk.313.1529501024598; Wed, 20 Jun 2018 06:23:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529501024; cv=none; d=google.com; s=arc-20160816; b=wARZ2jW91PBAYkbITaqQtYH69ZOIEKWH2XICMfvg+6OtPmwGbBenBPClMYDiMaTbNP ieBxmUqje/L1r0Q+uWr+vnYWhMAFfvzzrj9SkdOyrk6XBsLQWaQ3oE9VFiPGrX34023o 9/19f9u3p82juHRgz8WpDuZlSKGZjDKOQuyswkEtuiNloRLhpegZS5j+08tSNKhoy094 OgfJoL88ZEnrIospmvPhuYx9OWKqLpyQq51Lq+o5EI2SKiiCYglVWwfkG3NJBqYrVaRY EqFqKUP6inz0kRX8x9AqAnSC3h43zSMP9fpIrwNmJyZazRgqdFIF88DIm1o6hoyE1QQo O6Iw== 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=IhgAW8LQRUqP4svfxeXbuO79AzIghxFRGKUSpof6u+M=; b=DlB62hJ+a1pM9gYP4ZEVTFRwWLvm7/gY+VTNGbKfHBgU6lOhgN7YBT+l4K/t7kvtyr gn/clwXBn4h6Te5bt9aaknc1p9Ulb5GP8Qlkd5p0peGaWMj7aFUPjehoSu+WTfwMsald 76Qdt1rJVfsT4ib+myhr80i3+NcN22osAaCacVq/0reOOu/5kq3RylmUsQydT3WI5+FC ZiKYEjSdk4AyCxSCsKzKTLi7zfzgANiAr3GYMs3PCHLjA+JUV10G1/lic9PcC59iUXG2 pZ9urjZ3cXIUPdhKAur9XW+FXR66z1LdCKwvIZh+x3gnOOF9MnJ1IuzBdCaatIJ7tFYZ f/xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=A0JZ8o2X; 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 y34-v6si2401716plb.317.2018.06.20.06.23.30; Wed, 20 Jun 2018 06:23:44 -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=A0JZ8o2X; 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 S1754171AbeFTNWT (ORCPT + 99 others); Wed, 20 Jun 2018 09:22:19 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:38084 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753880AbeFTNWO (ORCPT ); Wed, 20 Jun 2018 09:22:14 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5KDEQwr172130; Wed, 20 Jun 2018 13:22:08 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=IhgAW8LQRUqP4svfxeXbuO79AzIghxFRGKUSpof6u+M=; b=A0JZ8o2XTYw6MR18AydyMJy+BLOZviDNK1olhf285S1TBOdHl5Uq6v5Z8o5/Seg7ehmY DBOalEhJo353m5CNm7yGGF4kywK8UFoY/TvjhRbXhW3VpfckkTorDNzNT1csmdCBuwy+ fTScYUsIn7w0e4eZL42O1zOODnPvVOq0JzGEanZouYzphcGbFfRXxP93d9ek3vOVhkFf GpGamXzyYSLvierCdj8Rs3ensFa37YXTbeAwbarqJP9yBajhNI1Zb6GcLIzBFzWj11aR mIZdm19sqwjKyPu11TWl8e4cY5wuD1y98C2FGb1nTMzKfY05mcUopkG0kMCUnjKL4dw+ iQ== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp2130.oracle.com with ESMTP id 2jmr2mmkax-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Jun 2018 13:22:08 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w5KDM72u032336 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Jun 2018 13:22:08 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w5KDM7kN029690; Wed, 20 Jun 2018 13:22:07 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:06 -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 2/5] nbd: use __blk_mq_complete_request in timeout path Date: Wed, 20 Jun 2018 21:22:41 +0800 Message-Id: <1529500964-28429-3-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=855 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/block/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 3b7083b..d7e533a 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -354,7 +354,7 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, sock_shutdown(nbd); nbd_config_put(nbd); done: - blk_mq_complete_request(req); + __blk_mq_complete_request(req); return BLK_EH_DONE; } -- 2.7.4