From patchwork Tue Jan 24 10:17:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9534773 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 21C5E6042D for ; Tue, 24 Jan 2017 10:18:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12B8224DA2 for ; Tue, 24 Jan 2017 10:18:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 075A326BE9; Tue, 24 Jan 2017 10:18:19 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 A2ACA24DA2 for ; Tue, 24 Jan 2017 10:18:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750936AbdAXKSS (ORCPT ); Tue, 24 Jan 2017 05:18:18 -0500 Received: from mail-lf0-f46.google.com ([209.85.215.46]:36233 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750935AbdAXKSR (ORCPT ); Tue, 24 Jan 2017 05:18:17 -0500 Received: by mail-lf0-f46.google.com with SMTP id z134so108126192lff.3 for ; Tue, 24 Jan 2017 02:18:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yPKkcMuzMsbiustzhJoXGYnVRUcv+qI1oydyp0QpwZc=; b=FKhzY0eqQA6CLooxGL/P8ByHTDr4/j2mGZa2pQUEcai4b49cp6Kxvu5JsSH3rvj7V0 8xMOmHQ4TOADABv4vOsZNGOMQ6CNlOjHnqYXYIJNvmDbG1B/iW5mHB6Hnl3/D7W1QIOB ZP91gEiQKbRlQMX0Raq7oxrgL9/3HYQFovMpI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yPKkcMuzMsbiustzhJoXGYnVRUcv+qI1oydyp0QpwZc=; b=uLtImUdKMofebWYzGTggfQqK39x+RtaT8fVETcVR9iDBWWTbsez/aesMNpM+T55iPK yI5YPLyoCc9s/vr8ImzzaJ2a4+wST7zqRqtkifaJac4Z+8aLJeuzSOKAT3Efi7vxSA5w XJaqEaSCvSwo3iqqZKRw8JNT2GT6TensjdXEHqAVL2jUC4fgvmCz0GlmkZLWcG2RZU5l mjQKlRlI/i4ufkq4WAdH43Pizo4ickdX9F28SiDeXWrdBh1qdetcmvPWZ9eMqIIY/u2A Czx/3GZEf8CAXynm1eYcj5Sf6jA7jjJWkW6McNAleW6rQvJjKzEUjAXZz6AqNTkLBbFi vn2g== X-Gm-Message-State: AIkVDXJ4R5U9TlQb2KTWg/3EDxFpwbcyye+1NZUHD+aia4n1mmf1IYa4Siw97PmFzHRj0Bi9 X-Received: by 10.25.221.217 with SMTP id w86mr9767833lfi.141.1485253095552; Tue, 24 Jan 2017 02:18:15 -0800 (PST) Received: from gnarp.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id o91sm7410797lfg.17.2017.01.24.02.18.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 02:18:14 -0800 (PST) From: Linus Walleij To: linux-mmc@vger.kernel.org, linux-block@vger.kernel.org, Ulf Hansson Cc: Chunyan Zhang , Baolin Wang , Paolo Valente , Linus Walleij Subject: [PATCH 3/6] mmc: block: do not assign mq_rq when aborting command Date: Tue, 24 Jan 2017 11:17:54 +0100 Message-Id: <20170124101757.19676-4-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170124101757.19676-1-linus.walleij@linaro.org> References: <20170124101757.19676-1-linus.walleij@linaro.org> 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 The code in mmc_blk_issue_rq_rq() aborts a command if the request is not properly aligned on large sectors. As part of the path jumping out, it assigns the local variable mq_rq reflecting a MMC queue request to the current MMC queue request, which is confusing since the variable is not used after this jump. Signed-off-by: Linus Walleij --- drivers/mmc/core/block.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index b60d1fb3a07a..13e6fe060f26 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1649,7 +1649,6 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) !IS_ALIGNED(blk_rq_sectors(rqc), 8)) { pr_err("%s: Transfer size is not 4KB sector size aligned\n", rqc->rq_disk->disk_name); - mq_rq = mq->mqrq_cur; req = rqc; rqc = NULL; goto cmd_abort;