From patchwork Tue Oct 16 14:33:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10643671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA0F4112B for ; Tue, 16 Oct 2018 14:33:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D81DB23B34 for ; Tue, 16 Oct 2018 14:33:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC7362640A; Tue, 16 Oct 2018 14:33:21 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 6D77124B44 for ; Tue, 16 Oct 2018 14:33:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726978AbeJPWYE (ORCPT ); Tue, 16 Oct 2018 18:24:04 -0400 Received: from mail-io1-f66.google.com ([209.85.166.66]:38394 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726760AbeJPWYE (ORCPT ); Tue, 16 Oct 2018 18:24:04 -0400 Received: by mail-io1-f66.google.com with SMTP id n5-v6so16663952ioh.5 for ; Tue, 16 Oct 2018 07:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=lQN4tlL8KtkVLPu4Mm4kOPpGgejgqJQp34KyIytj5Js=; b=LTTuwEb7fc99NA1dDE3B9sLzhcW+PtXGyvfVJeHfgVKjbm4HUuXpdV5Q69KEhIwOrH rn8P/XaBCn31nMkQhnuUQwaOdwVrmhBBcUU2ysqhJNLvQ3UlTeNbs5RuPZ2I37Pay0kZ QKd3sHDTHeyQLtC7OJY+7awCnjmWVsE86mxSeVpP6adQL9GSAa1RQXNrUPP7/yg2um+5 yXNfG5/azuWiEjNLdfHK9YLwndn3uu8e8A2SdfBVntwvW38XqacP9r7yoscAjcSEEKKY rC8ys4ERykB1V/7P71IOGD+cW29PzScD0IUEGkLfh4AQkRnNAOjH4p5x3iDzC1i3wXf5 lypQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=lQN4tlL8KtkVLPu4Mm4kOPpGgejgqJQp34KyIytj5Js=; b=KmrEqY1Za8Ad89Qv7ueQjqf4kpCj0o6wIRfFmr+2DARRJ6yP4dJDD/nN4ZojjGktZY auAjNdA9HL4rtpaHYkigao//ta3kDjl07+c5T5/932bHqS71MSiv6U84VuPerSaox87A +X/9agVuGL7S74yEqaXhk9owEGahDfZ7XsyuPo5hjbI/BXB6REm6Xj8jjKd6vOJ3gU2o k2J0lw6KC3jW+9T+MkfJrt8CUsZD4M9rwyZVi+pKUVr1xaTvMZEWkJ3oo3AjcknPeHWa vZa9oHgD88/h1bjBe99jG7O1EhmQq9sM3Q1mD2gVWcNKDr1C3jPEPe9gJmMBtbQ9arE/ Loyg== X-Gm-Message-State: ABuFfogk7gZRTlqWGIINIaeaFH67avl9saDjQdBcG1vbhpcSPifKCNcU /acrtNjEDpC1xCw65oP2iCxSoR7XusM= X-Google-Smtp-Source: ACcGV62yxRVXVGpCrpBbismXUdroILcvyGDmQ3AZsyBGMryhcb3GcL3jKpiPxnaERUiuToaPTQ6fvg== X-Received: by 2002:a6b:760e:: with SMTP id g14-v6mr11311782iom.46.1539700398988; Tue, 16 Oct 2018 07:33:18 -0700 (PDT) Received: from [192.168.1.56] ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id g200-v6sm5123937ita.44.2018.10.16.07.33.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Oct 2018 07:33:17 -0700 (PDT) To: linux-scsi From: Jens Axboe Subject: [PATCH] osd: initiator should use mq variant of request ending Message-ID: <33c8e59a-4c56-8998-7782-a970a0c5b9b4@kernel.dk> Date: Tue, 16 Oct 2018 08:33:16 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 Content-Language: en-US Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is currently wrong since it isn't dependent on if we're using mq or not. At least now it'll be correct when we force mq. Cc: linux-scsi@vger.kernel.org Signed-off-by: Jens Axboe --- drivers/scsi/osd/osd_initiator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c index 67b14576fff2..e19fa883376f 100644 --- a/drivers/scsi/osd/osd_initiator.c +++ b/drivers/scsi/osd/osd_initiator.c @@ -445,7 +445,7 @@ static void _put_request(struct request *rq) * code paths. */ if (unlikely(rq->bio)) - blk_end_request(rq, BLK_STS_IOERR, blk_rq_bytes(rq)); + blk_mq_end_request(rq, BLK_STS_IOERR); else blk_put_request(rq); }