From: Lee Jones <lee.jones@linaro.org>
To: lee.jones@linaro.org, gregkh@google.com, stable@vger.kernel.org
Subject: [PATCH 4.4 7/9] mmc: block: Fix tag condition with packed writes
Date: Fri, 22 Nov 2019 10:51:11 +0000 [thread overview]
Message-ID: <20191122105113.11213-7-lee.jones@linaro.org> (raw)
In-Reply-To: <20191122105113.11213-1-lee.jones@linaro.org>
From: Adrian Hunter <adrian.hunter@intel.com>
[ Upstream commit d806b46e5f496a6335ebd7f8432d2533507ce9a2 ]
Apparently a cut-and-paste error, 'do_data_tag' is using 'brq' for data
size even though 'brq' has not been set up. Instead use blk_rq_sectors().
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mmc/card/block.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index f600bdcaf5b4..07592e428755 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1772,8 +1772,7 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq,
do_data_tag = (card->ext_csd.data_tag_unit_size) &&
(prq->cmd_flags & REQ_META) &&
(rq_data_dir(prq) == WRITE) &&
- ((brq->data.blocks * brq->data.blksz) >=
- card->ext_csd.data_tag_unit_size);
+ blk_rq_bytes(prq) >= card->ext_csd.data_tag_unit_size;
/* Argument of CMD23 */
packed_cmd_hdr[(i * 2)] = cpu_to_le32(
(do_rel_wr ? MMC_CMD23_ARG_REL_WR : 0) |
--
2.24.0
next prev parent reply other threads:[~2019-11-22 10:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-22 10:51 [PATCH 4.4 1/9] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary Lee Jones
2019-11-22 10:51 ` [PATCH 4.4 2/9] can: dev: can_dellink(): remove return at end of void function Lee Jones
2019-11-22 10:51 ` [PATCH 4.4 3/9] arm64: fix for bad_mode() handler to always result in panic Lee Jones
2019-11-22 10:51 ` [PATCH 4.4 4/9] cpufreq: Skip cpufreq resume if it's not suspended Lee Jones
2019-11-22 10:51 ` [PATCH 4.4 5/9] bcache: silence static checker warning Lee Jones
2019-11-22 10:51 ` [PATCH 4.4 6/9] dm: use blk_set_queue_dying() in __dm_destroy() Lee Jones
2019-11-22 10:51 ` Lee Jones [this message]
2019-11-22 10:51 ` [PATCH 4.4 8/9] ocfs2: remove ocfs2_is_o2cb_active() Lee Jones
2019-11-22 10:51 ` [PATCH 4.4 9/9] ext4: avoid unnecessary stalls in ext4_evict_inode() Lee Jones
2019-11-22 16:32 ` [PATCH 4.4 1/9] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191122105113.11213-7-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=gregkh@google.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox