Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2018-12-10 08:41:00 +0100
committerJiri Slaby <jslaby@suse.cz>2018-12-10 08:41:00 +0100
commit5af5d73c83a3d658124ae0873a369ee8cc78ee9d (patch)
tree286543b0e544337c660b73158682f19110bb7a91
parent1e962f30c6c874e901411e42f4e6867738c84028 (diff)
patches.suse/blk-mq-fix-corruption-with-direct-issue.patch. It is in 4.20-rc6 as ffe81d45322c but was partially reverted by c616cbee97ae, so this patch still applies cleanly, but is unwanted. Drop it. suse-commit: 76703393bb4d1d60802acdce6189bc520643bcba
-rw-r--r--block/blk-mq.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 72fcdcaa806b..6a7566244de3 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1715,15 +1715,6 @@ static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx,
break;
case BLK_STS_RESOURCE:
case BLK_STS_DEV_RESOURCE:
- /*
- * If direct dispatch fails, we cannot allow any merging on
- * this IO. Drivers (like SCSI) may have set up permanent state
- * for this request, like SG tables and mappings, and if we
- * merge to it later on then we'll still only do IO to the
- * original part.
- */
- rq->cmd_flags |= REQ_NOMERGE;
-
blk_mq_update_dispatch_busy(hctx, true);
__blk_mq_requeue_request(rq);
break;