mtd: ubi: Make in_wl_tree function public
PATCH v2 3/5 mtd: ubi: Make in_wl_tree function public
Make the in_wl_tree function public to be used outside of wl.c. Rename it to ubi_in_wl_tree.
Signed-off-by Tanya Brokhman <[email protected]>
--- drivers/mtd/ubi/ubi.h | 1 + drivers/mtd/ubi/wl.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-)
drivers/mtd/ubi/ubi.h +1 -0
@@ -872,6 +872,7 @@ int ubi_wl_put_fm_peb(struct ubi_device *ubi, struct ubi_wl_entry *used_e,int ubi_is_erase_work (struct ubi_work *wrk);void ubi_refill_pools (struct ubi_device *ubi);int ubi_ensure_anchor_pebs (struct ubi_device *ubi); +int ubi_in_wl_tree (struct ubi_wl_entry *e,struct rb_root *root);/* io.c */ int ubi_io_read(const struct ubi_device *ubi, void *buf, int pnum, int offset,
drivers/mtd/ubi/wl.c +9 -9
@@ -291,14 +291,14 @@ static int produce_free_peb(struct ubi_device *ubi) }/** -* in_wl_tree - check if wear-leveling entry is present in a WL RB-tree. +* ubi_in_wl_tree - check if wear-leveling entry is present in a WL RB-tree. * @e: the wear-leveling entry to check * @root: the root of the tree * * This function returns non-zero if @e is in the @root RB-tree and zero if it * is not. */ -static int in_wl_tree (struct ubi_wl_entry *e,struct rb_root *root) +int ubi_in_wl_tree (struct ubi_wl_entry *e,struct rb_root *root) {struct rb_node *p;
@@ -1607,13 +1607,13 @@ retry:spin_unlock (&ubi->wl_lock);return 0 ; }else { -if (in_wl_tree (e, &ubi->used)) { +if (ubi_in_wl_tree (e, &ubi->used)) {self_check_in_wl_tree (ubi, e, &ubi->used);rb_erase (&e->u.rb, &ubi->used); - }else if (in_wl_tree (e, &ubi->scrub)) { + }else if (ubi_in_wl_tree (e, &ubi->scrub)) {self_check_in_wl_tree (ubi, e, &ubi->scrub);rb_erase (&e->u.rb, &ubi->scrub); - }else if (in_wl_tree (e, &ubi->erroneous)) { + }else if (ubi_in_wl_tree (e, &ubi->erroneous)) {self_check_in_wl_tree (ubi, e, &ubi->erroneous);rb_erase (&e->u.rb, &ubi->erroneous); ubi->erroneous_peb_count -=1 ;
@@ -1661,8 +1661,8 @@ int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum) retry:spin_lock (&ubi->wl_lock); e = ubi->lookuptbl[pnum]; -if (e == ubi->move_from ||in_wl_tree (e, &ubi->scrub) || -in_wl_tree (e, &ubi->erroneous)) { +if (e == ubi->move_from ||ubi_in_wl_tree (e, &ubi->scrub) || +ubi_in_wl_tree (e, &ubi->erroneous)) {spin_unlock (&ubi->wl_lock);return 0 ; }
@@ -1680,7 +1680,7 @@ retry: goto retry; } -if (in_wl_tree (e, &ubi->used)) { +if (ubi_in_wl_tree (e, &ubi->used)) {self_check_in_wl_tree (ubi, e, &ubi->used);rb_erase (&e->u.rb, &ubi->used); }else {
@@ -2150,7 +2150,7 @@ static int self_check_in_wl_tree(const struct ubi_device *ubi,if (!ubi_dbg_chk_gen (ubi))return 0 ; -if (in_wl_tree (e, root)) +if (ubi_in_wl_tree (e, root))return 0 ; ubi_err("self-check failed for PEB %d, EC %d, RB-tree %p ",
Signature · 3 lines
Qualcomm Israel, on behalf of Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project