aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/ubi/kapi.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2007-12-25 18:13:33 +0200
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2007-12-26 19:15:17 +0200
commit783b273afab43437dca731a229d53d72faf77fd3 (patch)
treedaadf822539189bcc81d64a609f2b084849114e5 /drivers/mtd/ubi/kapi.c
parent897a316c9e6f7fea6f1d3759797b75c0ebaec479 (diff)
downloadmrst-s0i3-test-783b273afab43437dca731a229d53d72faf77fd3.tar.gz
mrst-s0i3-test-783b273afab43437dca731a229d53d72faf77fd3.tar.xz
mrst-s0i3-test-783b273afab43437dca731a229d53d72faf77fd3.zip
UBI: use separate mutex for volumes checking
Introduce a separate mutex which serializes volumes checking, because we cammot really use volumes_mutex - it cases reverse locking problems with mtd_tbl_mutex when gluebi is used - thanks to lockdep. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/ubi/kapi.c')
-rw-r--r--drivers/mtd/ubi/kapi.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 4ec3a33b257..146957c3380 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -169,17 +169,12 @@ struct ubi_volume_desc *ubi_open_volume(int ubi_num, int vol_id, int mode)
desc->vol = vol;
desc->mode = mode;
- /*
- * To prevent simultaneous checks of the same volume we use
- * @volumes_mutex, although it is not the purpose it was introduced
- * for.
- */
- mutex_lock(&ubi->volumes_mutex);
+ mutex_lock(&ubi->ckvol_mutex);
if (!vol->checked) {
/* This is the first open - check the volume */
err = ubi_check_volume(ubi, vol_id);
if (err < 0) {
- mutex_unlock(&ubi->volumes_mutex);
+ mutex_unlock(&ubi->ckvol_mutex);
ubi_close_volume(desc);
return ERR_PTR(err);
}
@@ -190,7 +185,7 @@ struct ubi_volume_desc *ubi_open_volume(int ubi_num, int vol_id, int mode)
}
vol->checked = 1;
}
- mutex_unlock(&ubi->volumes_mutex);
+ mutex_unlock(&ubi->ckvol_mutex);
return desc;