From patchwork Thu Aug 17 20:13:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9907119 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 BF46260386 for ; Thu, 17 Aug 2017 20:16:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B358828BBB for ; Thu, 17 Aug 2017 20:16:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A83A228BBC; Thu, 17 Aug 2017 20:16:34 +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=-6.9 required=2.0 tests=BAYES_00,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 4B5A228BBD for ; Thu, 17 Aug 2017 20:16:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753663AbdHQUQc (ORCPT ); Thu, 17 Aug 2017 16:16:32 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:39477 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753485AbdHQUQb (ORCPT ); Thu, 17 Aug 2017 16:16:31 -0400 X-IronPort-AV: E=Sophos;i="5.41,389,1498492800"; d="scan'208";a="43186020" Received: from sjappemgw12.hgst.com (HELO sjappemgw11.hgst.com) ([199.255.44.66]) by ob1.hgst.iphmx.com with ESMTP; 18 Aug 2017 04:13:56 +0800 Received: from thinkpad-bart.sdcorp.global.sandisk.com (HELO thinkpad-bart.int.fusionio.com) ([10.11.172.152]) by sjappemgw11.hgst.com with ESMTP; 17 Aug 2017 13:13:42 -0700 From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , Damien Le Moal , Akhil Bhansali , Bart Van Assche , Hannes Reinecke , Johannes Thumshirn Subject: [PATCH 46/55] skd: Split skd_recover_requests() Date: Thu, 17 Aug 2017 13:13:29 -0700 Message-Id: <20170817201338.16537-47-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170817201338.16537-1-bart.vanassche@wdc.com> References: <20170817201338.16537-1-bart.vanassche@wdc.com> 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 This patch does not change any functionality but makes the blk-mq conversion patch easier to read. Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Johannes Thumshirn --- drivers/block/skd_main.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c index 1d10373b0da3..451974138b32 100644 --- a/drivers/block/skd_main.c +++ b/drivers/block/skd_main.c @@ -2031,31 +2031,36 @@ static void skd_isr_fwstate(struct skd_device *skdev) skd_skdev_state_to_str(skdev->state), skdev->state); } -static void skd_recover_requests(struct skd_device *skdev) +static void skd_recover_request(struct skd_device *skdev, + struct skd_request_context *skreq) { - int i; + struct request *req = skreq->req; - for (i = 0; i < skdev->num_req_context; i++) { - struct skd_request_context *skreq = &skdev->skreq_table[i]; - struct request *req = skreq->req; + if (skreq->state != SKD_REQ_STATE_BUSY) + return; + + skd_log_skreq(skdev, skreq, "recover"); + + SKD_ASSERT(req != NULL); - if (skreq->state == SKD_REQ_STATE_BUSY) { - skd_log_skreq(skdev, skreq, "recover"); + /* Release DMA resources for the request. */ + if (skreq->n_sg > 0) + skd_postop_sg_list(skdev, skreq); - SKD_ASSERT((skreq->id & SKD_ID_INCR) != 0); - SKD_ASSERT(req != NULL); + skreq->req = NULL; + skreq->state = SKD_REQ_STATE_IDLE; - /* Release DMA resources for the request. */ - if (skreq->n_sg > 0) - skd_postop_sg_list(skdev, skreq); + skd_end_request(skdev, req, BLK_STS_IOERR); +} - skreq->req = NULL; +static void skd_recover_requests(struct skd_device *skdev) +{ + int i; - skreq->state = SKD_REQ_STATE_IDLE; - skreq->id += SKD_ID_INCR; + for (i = 0; i < skdev->num_req_context; i++) { + struct skd_request_context *skreq = &skdev->skreq_table[i]; - skd_end_request(skdev, req, BLK_STS_IOERR); - } + skd_recover_request(skdev, skreq); } for (i = 0; i < SKD_N_TIMEOUT_SLOT; i++)