AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

UBI: provide an helper to check whether a LEB is mapped or not

Browse Source 
This is part of the process of hiding UBI EBA's internal to other part of
the UBI implementation, so that we can add new information to the EBA
table without having to patch different places in the UBI code.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Boris Brezillon 2016-09-16 16:59:23 +02:00 committed by Richard Weinberger
parent 9a5f09ac0a
commit 7554769641
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mtd/ubi/eba.c
View File

@ -311,6 +311,18 @@ static void leb_write_unlock(struct ubi_device *ubi, int vol_id, int lnum)
spin_unlock(&ubi->ltree_lock); spin_unlock(&ubi->ltree_lock);
} }
/**
* ubi_eba_is_mapped - check if a LEB is mapped.
* @vol: volume description object
* @lnum: logical eraseblock number
*
* This function returns true if the LEB is mapped, false otherwise.
*/
bool ubi_eba_is_mapped(struct ubi_volume *vol, int lnum)
{
return vol->eba_tbl[lnum] >= 0;
}
/** /**
* ubi_eba_unmap_leb - un-map logical eraseblock. * ubi_eba_unmap_leb - un-map logical eraseblock.
* @ubi: UBI device description object * @ubi: UBI device description object

4
drivers/mtd/ubi/kapi.c
View File

@ -722,7 +722,7 @@ int ubi_leb_map(struct ubi_volume_desc *desc, int lnum)
if (vol->upd_marker) if (vol->upd_marker)
return -EBADF; return -EBADF;
if (vol->eba_tbl[lnum] >= 0) if (ubi_eba_is_mapped(vol, lnum))
return -EBADMSG; return -EBADMSG;
return ubi_eba_write_leb(ubi, vol, lnum, NULL, 0, 0); return ubi_eba_write_leb(ubi, vol, lnum, NULL, 0, 0);
@ -757,7 +757,7 @@ int ubi_is_mapped(struct ubi_volume_desc *desc, int lnum)
if (vol->upd_marker) if (vol->upd_marker)
return -EBADF; return -EBADF;
return vol->eba_tbl[lnum] >= 0; return ubi_eba_is_mapped(vol, lnum);
} }
EXPORT_SYMBOL_GPL(ubi_is_mapped); EXPORT_SYMBOL_GPL(ubi_is_mapped);

1
drivers/mtd/ubi/ubi.h
View File

@ -849,6 +849,7 @@ static inline bool ubi_leb_valid(struct ubi_volume *vol, int lnum)
} }
/* eba.c */ /* eba.c */
bool ubi_eba_is_mapped(struct ubi_volume *vol, int lnum);
int ubi_eba_unmap_leb(struct ubi_device *ubi, struct ubi_volume *vol, int ubi_eba_unmap_leb(struct ubi_device *ubi, struct ubi_volume *vol,
int lnum); int lnum);
int ubi_eba_read_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum, int ubi_eba_read_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum,