From ccceb6e6f074dcc0d595a696e46db9f7fd2e7a01 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 30 Dec 2022 10:37:05 +0100 Subject: [PATCH] drop queue-5.15/blk-iocost-simplify-ioc_name.patch Not needed anywhere. --- queue-5.15/blk-iocost-simplify-ioc_name.patch | 53 ------------------- queue-5.15/series | 1 - 2 files changed, 54 deletions(-) delete mode 100644 queue-5.15/blk-iocost-simplify-ioc_name.patch diff --git a/queue-5.15/blk-iocost-simplify-ioc_name.patch b/queue-5.15/blk-iocost-simplify-ioc_name.patch deleted file mode 100644 index c9d35549c9e..00000000000 --- a/queue-5.15/blk-iocost-simplify-ioc_name.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 544655d1492227d5b309feb166eaf7999f2058ee Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 21 Sep 2022 20:04:53 +0200 -Subject: blk-iocost: simplify ioc_name - -From: Christoph Hellwig - -[ Upstream commit 9df3e65139b923dfe98f76b7057882c7afb2d3e4 ] - -Just directly dereference the disk name instead of going through multiple -hoops to find the same value. - -Signed-off-by: Christoph Hellwig -Reviewed-by: Andreas Herrmann -Acked-by: Tejun Heo -Link: https://lore.kernel.org/r/20220921180501.1539876-10-hch@lst.de -Signed-off-by: Jens Axboe -Stable-dep-of: d36a9ea5e776 ("block: fix use-after-free of q->q_usage_counter") -Signed-off-by: Sasha Levin ---- - block/blk-iocost.c | 14 +++++--------- - 1 file changed, 5 insertions(+), 9 deletions(-) - -diff --git a/block/blk-iocost.c b/block/blk-iocost.c -index 069193dee95b..f5b501888ba4 100644 ---- a/block/blk-iocost.c -+++ b/block/blk-iocost.c -@@ -665,17 +665,13 @@ static struct ioc *q_to_ioc(struct request_queue *q) - return rqos_to_ioc(rq_qos_id(q, RQ_QOS_COST)); - } - --static const char *q_name(struct request_queue *q) --{ -- if (blk_queue_registered(q)) -- return kobject_name(q->kobj.parent); -- else -- return ""; --} -- - static const char __maybe_unused *ioc_name(struct ioc *ioc) - { -- return q_name(ioc->rqos.q); -+ struct gendisk *disk = ioc->rqos.q->disk; -+ -+ if (!disk) -+ return ""; -+ return disk->disk_name; - } - - static struct ioc_gq *pd_to_iocg(struct blkg_policy_data *pd) --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 29d5e55d97c..5bd03a8bb44 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -589,7 +589,6 @@ net-enetc-avoid-buffer-leaks-on-xdp_do_redirect-fail.patch nfc-pn533-clear-nfc_target-before-being-used.patch unix-fix-race-in-sock_seqpacket-s-unix_dgram_sendmsg.patch r6040-fix-kmemleak-in-probe-and-remove.patch -blk-iocost-simplify-ioc_name.patch igc-enhance-qbv-scheduling-by-using-first-flag-bit.patch igc-use-strict-cycles-for-qbv-scheduling.patch igc-add-checking-for-basetime-less-than-zero.patch -- 2.47.3