diff options
| author | Richard Weinberger <richard@nod.at> | 2014-10-29 10:31:41 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2015-03-26 22:47:36 +0100 |
| commit | 2f84c2469e2f2e94a45d86597baec10bfbf06847 (patch) | |
| tree | b0ad83d93c8cea978244fa7c579f5bf3a2e25fa6 /drivers/mtd/ubi/wl.c | |
| parent | acfda79f8808518b0235eb9a13c8b5f762e43a75 (diff) | |
UBI: Fastmap: Introduce may_reserve_for_fm()
...and kill another #ifdef.
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'drivers/mtd/ubi/wl.c')
| -rw-r--r-- | drivers/mtd/ubi/wl.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index c56c7a16c03b..94ffdeb370c1 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -361,15 +361,10 @@ static struct ubi_wl_entry *find_mean_wl_entry(struct ubi_device *ubi, if (last->ec - first->ec < WL_FREE_MAX_DIFF) { e = rb_entry(root->rb_node, struct ubi_wl_entry, u.rb); -#ifdef CONFIG_MTD_UBI_FASTMAP /* If no fastmap has been written and this WL entry can be used * as anchor PEB, hold it back and return the second best * WL entry such that fastmap can use the anchor PEB later. */ - if (e && !ubi->fm_disabled && !ubi->fm && - e->pnum < UBI_FM_MAX_START) - e = rb_entry(rb_next(root->rb_node), - struct ubi_wl_entry, u.rb); -#endif + e = may_reserve_for_fm(ubi, e, root); } else e = find_wl_entry(ubi, root, WL_FREE_MAX_DIFF/2); |