From patchwork Wed May 23 12:19:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421079 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 71D0B6032A for ; Wed, 23 May 2018 12:20:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62F2628E0D for ; Wed, 23 May 2018 12:20:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B83F28F41; Wed, 23 May 2018 12:20:40 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable 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 F13E228E0D for ; Wed, 23 May 2018 12:20:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932840AbeEWMUh (ORCPT ); Wed, 23 May 2018 08:20:37 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:37674 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932534AbeEWMUg (ORCPT ); Wed, 23 May 2018 08:20:36 -0400 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=p7kNoIQDTdNAklMt5GJIwo8kZjaILw9osN0PvR/7fsg=; b=cdSbTBxNlAFX3BWM9IZ1X+lG1 /namE6zpvFVj6JIzujXLO4o6x8taKewtQEWbothPEFsDUUpyAJTGZYCUTjjmnaZDmVR+P8tuRSCMY 015rsO5+somDsnFCne6axS6WlIh4Kq2LHpR+ea1XtrYHICfr9iBl3h1KMkpt3K/es2Hka0li998Cx tV6AFWCDlWlOz5YtFzwqLH1asdylfDxApBMN47bKJgwiu4+A0iedGEiOSk/UKYr6z02hG+TSFPJN0 knoxHKexHchtm6wyAv//VQ/u2Jo03LFoNiKiOKwNKp/Ma648/VK8hjhmxC9l8OH0QFoFVT9EDSVUc rY5xW6Zsg==; Received: from clnet-p01-149.ikbnet.co.at ([83.175.85.149] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLSkq-0002Xx-5f; Wed, 23 May 2018 12:20:32 +0000 From: Christoph Hellwig To: Jens Axboe , Keith Busch Cc: Bart Van Assche , Ming Lei , Josef Bacik , Tejun Heo , Lee Duncan , Chris Leech , Rafael David Tinoco , linux-block@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 05/14] mtip32xx: complete requests from ->timeout Date: Wed, 23 May 2018 14:19:32 +0200 Message-Id: <20180523121941.8632-6-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523121941.8632-1-hch@lst.de> References: <20180523121941.8632-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP By completing the request entirely in the driver we can remove the BLK_EH_HANDLED return value and thus the split responsibility between the driver and the block layer that has been causing trouble. Signed-off-by: Christoph Hellwig Reviewed-by: Johannes Thumshirn Reviewed-by: Hannes Reinecke --- drivers/block/mtip32xx/mtip32xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 6df5b0b1517a..beace13effe4 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -3720,7 +3720,8 @@ static enum blk_eh_timer_return mtip_cmd_timeout(struct request *req, struct mtip_cmd *cmd = blk_mq_rq_to_pdu(req); cmd->status = BLK_STS_TIMEOUT; - return BLK_EH_HANDLED; + blk_mq_complete_request(req); + return BLK_EH_DONE; } if (test_bit(req->tag, dd->port->cmds_to_issue))