@@ -906,7 +906,6 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset)
mutex_init(&ubi->buf_mutex);
mutex_init(&ubi->ckvol_mutex);
mutex_init(&ubi->device_mutex);
- mutex_init(&ubi->fm_pool_mutex);
mutex_init(&ubi->fm_mutex);
init_rwsem(&ubi->fm_sem);
spin_lock_init(&ubi->volumes_lock);
@@ -382,7 +382,6 @@ struct ubi_wl_entry;
*
* @fm: in-memory data structure of the currently used fastmap
* @fm_pool: in-memory data structure of the fastmap pool
- * @fm_pool_mutex: serializes ubi_wl_get_peb()
* @fm_mutex: serializes ubi_update_fastmap()
* @fm_sem: allows ubi_update_fastmap() to block EBA table changes
* @fm_work: fastmap work queue
@@ -486,7 +485,6 @@ struct ubi_device {
struct ubi_fm_pool fm_wl_pool;
struct rw_semaphore fm_sem;
struct mutex fm_mutex;
- struct mutex fm_pool_mutex;
struct work_struct fm_work;
int attached_by_scanning;
@@ -609,8 +609,6 @@ int ubi_wl_get_peb(struct ubi_device *ubi)
struct ubi_fm_pool *pool = &ubi->fm_pool;
struct ubi_fm_pool *wl_pool = &ubi->fm_wl_pool;
- mutex_lock(&ubi->fm_pool_mutex);
-
if (!pool->size || !wl_pool->size || pool->used == pool->size ||
wl_pool->used == wl_pool->size)
ubi_update_fastmap(ubi);
@@ -625,8 +623,6 @@ int ubi_wl_get_peb(struct ubi_device *ubi)
spin_unlock(&ubi->wl_lock);
}
- mutex_unlock(&ubi->fm_pool_mutex);
-
return ret;
}
This mutex is no longer needed. Signed-off-by: Richard Weinberger <richard@nod.at> --- drivers/mtd/ubi/build.c | 1 - drivers/mtd/ubi/ubi.h | 2 -- drivers/mtd/ubi/wl.c | 4 ---- 3 files changed, 0 insertions(+), 7 deletions(-)