lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UBI: dont call ubi_self_check_all_ff() in __wl_get_peb()

Browse Source 
As ubi_self_check_all_ff() might sleep we are not allowed
to call it from atomic context.
For now we call it only from ubi_wl_get_peb().
There are some code paths where it would also make sense,
but these paths are currently atomic and only enabled
when fastmap is used.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This commit is contained in:
Richard Weinberger
2012-12-03 20:57:47 +01:00
committed by Artem Bityutskiy
parent ed4b7021cb
commit 894aef2157
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/mtd/ubi/wl.c
View File

@@ -498,7 +498,7 @@ out:
* @ubi: UBI device description object * @ubi: UBI device description object
* *
* This function returns a physical eraseblock in case of success and a * This function returns a physical eraseblock in case of success and a
* negative error code in case of failure. Might sleep. * negative error code in case of failure.
*/ */
static int __wl_get_peb(struct ubi_device *ubi) static int __wl_get_peb(struct ubi_device *ubi)
{ {
@@ -540,13 +540,6 @@ retry:
* ubi_wl_get_peb() after removing e from the pool. */ * ubi_wl_get_peb() after removing e from the pool. */
prot_queue_add(ubi, e); prot_queue_add(ubi, e);
#endif #endif
err = ubi_self_check_all_ff(ubi, e->pnum, ubi->vid_hdr_aloffset,
ubi->peb_size - ubi->vid_hdr_aloffset);
if (err) {
ubi_err("new PEB %d does not contain all 0xFF bytes", e->pnum);
return err;
}
return e->pnum; return e->pnum;
} }
@@ -690,12 +683,19 @@ static struct ubi_wl_entry *get_peb_for_wl(struct ubi_device *ubi)
int ubi_wl_get_peb(struct ubi_device *ubi) int ubi_wl_get_peb(struct ubi_device *ubi)
{ {
int peb; int peb, err;
spin_lock(&ubi->wl_lock); spin_lock(&ubi->wl_lock);
peb = __wl_get_peb(ubi); peb = __wl_get_peb(ubi);
spin_unlock(&ubi->wl_lock); spin_unlock(&ubi->wl_lock);
err = ubi_self_check_all_ff(ubi, peb, ubi->vid_hdr_aloffset,
ubi->peb_size - ubi->vid_hdr_aloffset);
if (err) {
ubi_err("new PEB %d does not contain all 0xFF bytes", peb);
return err;
}
return peb; return peb;
} }
#endif #endif