|
Jiri Slaby |
ef7db2 |
From: Ming Lei <ming.lei@redhat.com>
|
|
Jiri Slaby |
ef7db2 |
Date: Fri, 6 Jan 2023 12:17:06 +0800
|
|
Jiri Slaby |
ef7db2 |
Subject: [PATCH] ublk_drv: remove nr_aborted_queues from ublk_device
|
|
Jiri Slaby |
ef7db2 |
References: bsc#1012628
|
|
Jiri Slaby |
ef7db2 |
Patch-mainline: 6.2.3
|
|
Jiri Slaby |
ef7db2 |
Git-commit: ed878d1c1c641c4a6bd366658fc8e6bc842b80d1
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
[ Upstream commit ed878d1c1c641c4a6bd366658fc8e6bc842b80d1 ]
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
No one uses 'nr_aborted_queues' any more, so remove it.
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
Reviewed-by: ZiyangZhang <ZiyangZhang@linux.alibaba.com>
|
|
Jiri Slaby |
ef7db2 |
Signed-off-by: Ming Lei <ming.lei@redhat.com>
|
|
Jiri Slaby |
ef7db2 |
Link: https://lore.kernel.org/r/20230106041711.914434-2-ming.lei@redhat.com
|
|
Jiri Slaby |
ef7db2 |
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
|
Jiri Slaby |
ef7db2 |
Stable-dep-of: 73a166d97492 ("ublk_drv: don't probe partitions if the ubq daemon isn't trusted")
|
|
Jiri Slaby |
ef7db2 |
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
|
Jiri Slaby |
ef7db2 |
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
|
|
Jiri Slaby |
ef7db2 |
---
|
|
Jiri Slaby |
ef7db2 |
drivers/block/ublk_drv.c | 1 -
|
|
Jiri Slaby |
ef7db2 |
1 file changed, 1 deletion(-)
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
|
|
Jiri Slaby |
ef7db2 |
index 6368b56e..f44b9467 100644
|
|
Jiri Slaby |
ef7db2 |
--- a/drivers/block/ublk_drv.c
|
|
Jiri Slaby |
ef7db2 |
+++ b/drivers/block/ublk_drv.c
|
|
Jiri Slaby |
ef7db2 |
@@ -159,7 +159,6 @@ struct ublk_device {
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
struct completion completion;
|
|
Jiri Slaby |
ef7db2 |
unsigned int nr_queues_ready;
|
|
Jiri Slaby |
ef7db2 |
- atomic_t nr_aborted_queues;
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
/*
|
|
Jiri Slaby |
ef7db2 |
* Our ubq->daemon may be killed without any notification, so
|
|
Jiri Slaby |
ef7db2 |
--
|
|
Jiri Slaby |
ef7db2 |
2.35.3
|
|
Jiri Slaby |
ef7db2 |
|