| From 94898585e53b200b06fb46e192bc181a2703e3da Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 17 Feb 2021 20:53:20 +0100 |
| Subject: mtd: don't lock when recursively deleting partitions |
| |
| From: David Bauer <mail@david-bauer.net> |
| |
| [ Upstream commit cb4543054c5c4fd33df960b41d7b483ebca8e786 ] |
| |
| When recursively deleting partitions, don't acquire the masters |
| partition lock twice. Otherwise the process ends up in a deadlocked |
| state. |
| |
| Fixes: 46b5889cc2c5 ("mtd: implement proper partition handling") |
| Signed-off-by: David Bauer <mail@david-bauer.net> |
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Link: https://lore.kernel.org/linux-mtd/20210217195320.893253-1-mail@david-bauer.net |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mtd/mtdpart.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c |
| index 12ca4f19cb14..665fd9020b76 100644 |
| --- a/drivers/mtd/mtdpart.c |
| +++ b/drivers/mtd/mtdpart.c |
| @@ -331,7 +331,7 @@ static int __del_mtd_partitions(struct mtd_info *mtd) |
| |
| list_for_each_entry_safe(child, next, &mtd->partitions, part.node) { |
| if (mtd_has_partitions(child)) |
| - del_mtd_partitions(child); |
| + __del_mtd_partitions(child); |
| |
| pr_info("Deleting %s MTD partition\n", child->name); |
| ret = del_mtd_device(child); |
| -- |
| 2.30.2 |
| |
