This reverts commit e94b04fcb7d227180b1e6a1bad4832ffedccb473.
The issue that this patch is trying to resolve has been fixed by
upstream commit 19bfa9ebebb5 ("mtd: use refcount to prevent corruption")
so this local patch can be reverted, if not, it will cause an unbalanced
refcnt issue when open/close mtd device.
Signed-off-by: Liwei Song <[email protected]>
---
drivers/mtd/mtd_blkdevs.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index bb953f93c2b8..47ead84407cd 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -189,8 +189,6 @@ static int blktrans_open(struct gendisk *disk, blk_mode_t
mode)
kref_get(&dev->ref);
- if (!mutex_trylock(&mtd_table_mutex))
- return ret;
mutex_lock(&dev->lock);
if (dev->open)
@@ -215,7 +213,6 @@ static int blktrans_open(struct gendisk *disk, blk_mode_t
mode)
unlock:
dev->open++;
mutex_unlock(&dev->lock);
- mutex_unlock(&mtd_table_mutex);
return ret;
error_release:
@@ -224,7 +221,6 @@ static int blktrans_open(struct gendisk *disk, blk_mode_t
mode)
error_put:
module_put(dev->tr->owner);
mutex_unlock(&dev->lock);
- mutex_unlock(&mtd_table_mutex);
blktrans_dev_put(dev);
return ret;
}
@@ -233,8 +229,6 @@ static void blktrans_release(struct gendisk *disk)
{
struct mtd_blktrans_dev *dev = disk->private_data;
- if (!mutex_trylock(&mtd_table_mutex))
- return;
mutex_lock(&dev->lock);
if (--dev->open)
@@ -249,7 +243,6 @@ static void blktrans_release(struct gendisk *disk)
}
unlock:
mutex_unlock(&dev->lock);
- mutex_unlock(&mtd_table_mutex);
blktrans_dev_put(dev);
}
--
2.44.3
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16052):
https://lists.yoctoproject.org/g/linux-yocto/message/16052
Mute This Topic: https://lists.yoctoproject.org/mt/116788247/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
