diff options
author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-05-07 04:25:54 -0400 |
---|---|---|
committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-05-18 05:26:41 -0400 |
commit | 383d08e045faddd89797959786233d4c0e1ace80 (patch) | |
tree | 3f7456e3aea9b69fe18920791cf06bda6497a64f /drivers/mtd/ubi/ubi.h | |
parent | 1406de8e11eb043681297adf86d6892ff8efc27a (diff) |
UBI: remove redundant mutex
The @mult_mutex does not serve any purpose. We already have
@volumes_mutex and it is enough. The @volume mutex is pushed
down to the 'ubi_rename_volumes()', because we want first
to open all volumes in the exclusive mode, and then lock the
mutex, just like all other ioctl's (remove, re-size, etc) do.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/ubi/ubi.h')
-rw-r--r-- | drivers/mtd/ubi/ubi.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index c055511bb1b2..485c73f850c1 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h | |||
@@ -366,7 +366,6 @@ struct ubi_wl_entry; | |||
366 | * @peb_buf2: another buffer of PEB size used for different purposes | 366 | * @peb_buf2: another buffer of PEB size used for different purposes |
367 | * @buf_mutex: protects @peb_buf1 and @peb_buf2 | 367 | * @buf_mutex: protects @peb_buf1 and @peb_buf2 |
368 | * @ckvol_mutex: serializes static volume checking when opening | 368 | * @ckvol_mutex: serializes static volume checking when opening |
369 | * @mult_mutex: serializes operations on multiple volumes, like re-naming | ||
370 | * @dbg_peb_buf: buffer of PEB size used for debugging | 369 | * @dbg_peb_buf: buffer of PEB size used for debugging |
371 | * @dbg_buf_mutex: protects @dbg_peb_buf | 370 | * @dbg_buf_mutex: protects @dbg_peb_buf |
372 | */ | 371 | */ |
@@ -444,7 +443,6 @@ struct ubi_device { | |||
444 | void *peb_buf2; | 443 | void *peb_buf2; |
445 | struct mutex buf_mutex; | 444 | struct mutex buf_mutex; |
446 | struct mutex ckvol_mutex; | 445 | struct mutex ckvol_mutex; |
447 | struct mutex mult_mutex; | ||
448 | #ifdef CONFIG_MTD_UBI_DEBUG | 446 | #ifdef CONFIG_MTD_UBI_DEBUG |
449 | void *dbg_peb_buf; | 447 | void *dbg_peb_buf; |
450 | struct mutex dbg_buf_mutex; | 448 | struct mutex dbg_buf_mutex; |