Adapt second hunk so it applies cleanly.

linux-ia64 · Jul 30, 2024 · 28627c1 · 28627c1
1 parent 4aa3ed0
commit 28627c1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/patches/linux-6.1.y/6259151c04d4e0085e00d2dcb471ebdd1778e72e.patch b/patches/linux-6.1.y/6259151c04d4e0085e00d2dcb471ebdd1778e72e.patch
@@ -34,16 +34,16 @@ index fec2dea5c6e885..e3c3c0c21b5536 100644
  	if (q->elevator) {
  		/*
  		 * All requests use scheduler tags when an I/O scheduler is
-@@ -469,13 +473,9 @@ static struct request *__blk_mq_alloc_requests(struct blk_mq_alloc_data *data)
- 			if (ops->limit_depth)
- 				ops->limit_depth(data->cmd_flags, data);
- 		}
+@@ -466,13 +470,9 @@ static struct request *__blk_mq_alloc_requests(struct blk_mq_alloc_data *data)
+ 		    e->type->ops.limit_depth &&
+ 		    !(data->flags & BLK_MQ_REQ_RESERVED))
+ 			e->type->ops.limit_depth(data->cmd_flags, data);
 -	}
 -
 -retry:
 -	data->ctx = blk_mq_get_ctx(q);
 -	data->hctx = blk_mq_map_queue(q, data->cmd_flags, data->ctx);
--	if (!(data->rq_flags & RQF_SCHED_TAGS))
+-	if (!(data->rq_flags & RQF_ELV))
 +	} else {
  		blk_mq_tag_busy(data->hctx);
 +	}