malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

UBI: wl: Rename cancel flag to shutdown

Browse Source 
It confused me more than once that the cancel flag of the
work function does not indicate the cancellation of a single work.
In fact it indicates the WL sub-system shutdown and therefore
worker functions have to free their wl_entries too.
That's why you cannot cancel a single work, you can only shutdown
all works.

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 2014-09-22 10:45:35 +02:00 committed by Artem Bityutskiy
parent 170505f58f
commit 849271a4e4
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -714,14 +714,15 @@ struct ubi_attach_info {
* @torture: if the physical eraseblock has to be tortured * @torture: if the physical eraseblock has to be tortured
* @anchor: produce a anchor PEB to by used by fastmap * @anchor: produce a anchor PEB to by used by fastmap
* *
* The @func pointer points to the worker function. If the @cancel argument is * The @func pointer points to the worker function. If the @shutdown argument is
* not zero, the worker has to free the resources and exit immediately. The * not zero, the worker has to free the resources and exit immediately as the
* worker has to return zero in case of success and a negative error code in * WL sub-system is shutting down.
* The worker has to return zero in case of success and a negative error code in
* case of failure. * case of failure.
*/ */
struct ubi_work { struct ubi_work {
struct list_head list; struct list_head list;
int (*func)(struct ubi_device *ubi, struct ubi_work *wrk, int cancel); int (*func)(struct ubi_device *ubi, struct ubi_work *wrk, int shutdown);
/* The below fields are only relevant to erasure works */ /* The below fields are only relevant to erasure works */
struct ubi_wl_entry *e; struct ubi_wl_entry *e;
int vol_id; int vol_id;

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

@ -864,7 +864,7 @@ static void schedule_ubi_work(struct ubi_device *ubi, struct ubi_work *wrk)
} }
static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk, static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
int cancel); int shutdown);
#ifdef CONFIG_MTD_UBI_FASTMAP #ifdef CONFIG_MTD_UBI_FASTMAP
/** /**
@ -990,14 +990,15 @@ int ubi_wl_put_fm_peb(struct ubi_device *ubi, struct ubi_wl_entry *fm_e,
* wear_leveling_worker - wear-leveling worker function. * wear_leveling_worker - wear-leveling worker function.
* @ubi: UBI device description object * @ubi: UBI device description object
* @wrk: the work object * @wrk: the work object
* @cancel: non-zero if the worker has to free memory and exit * @shutdown: non-zero if the worker has to free memory and exit
* because the WL-subsystem is shutting down
* *
* This function copies a more worn out physical eraseblock to a less worn out * This function copies a more worn out physical eraseblock to a less worn out
* one. Returns zero in case of success and a negative error code in case of * one. Returns zero in case of success and a negative error code in case of
* failure. * failure.
*/ */
static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
int cancel) int shutdown)
{ {
int err, scrubbing = 0, torture = 0, protect = 0, erroneous = 0; int err, scrubbing = 0, torture = 0, protect = 0, erroneous = 0;
int vol_id = -1, uninitialized_var(lnum); int vol_id = -1, uninitialized_var(lnum);
@ -1008,7 +1009,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
struct ubi_vid_hdr *vid_hdr; struct ubi_vid_hdr *vid_hdr;
kfree(wrk); kfree(wrk);
if (cancel) if (shutdown)
return 0; return 0;
vid_hdr = ubi_zalloc_vid_hdr(ubi, GFP_NOFS); vid_hdr = ubi_zalloc_vid_hdr(ubi, GFP_NOFS);
@ -1407,7 +1408,8 @@ int ubi_ensure_anchor_pebs(struct ubi_device *ubi)
* erase_worker - physical eraseblock erase worker function. * erase_worker - physical eraseblock erase worker function.
* @ubi: UBI device description object * @ubi: UBI device description object
* @wl_wrk: the work object * @wl_wrk: the work object
* @cancel: non-zero if the worker has to free memory and exit * @shutdown: non-zero if the worker has to free memory and exit
* because the WL sub-system is shutting down
* *
* This function erases a physical eraseblock and perform torture testing if * This function erases a physical eraseblock and perform torture testing if
* needed. It also takes care about marking the physical eraseblock bad if * needed. It also takes care about marking the physical eraseblock bad if
@ -1415,7 +1417,7 @@ int ubi_ensure_anchor_pebs(struct ubi_device *ubi)
* failure. * failure.
*/ */
static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk, static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
int cancel) int shutdown)
{ {
struct ubi_wl_entry *e = wl_wrk->e; struct ubi_wl_entry *e = wl_wrk->e;
int pnum = e->pnum; int pnum = e->pnum;
@ -1423,7 +1425,7 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
int lnum = wl_wrk->lnum; int lnum = wl_wrk->lnum;
int err, available_consumed = 0; int err, available_consumed = 0;
if (cancel) { if (shutdown) {
dbg_wl("cancel erasure of PEB %d EC %d", pnum, e->ec); dbg_wl("cancel erasure of PEB %d EC %d", pnum, e->ec);
kfree(wl_wrk); kfree(wl_wrk);
kmem_cache_free(ubi_wl_entry_slab, e); kmem_cache_free(ubi_wl_entry_slab, e);
@ -1845,10 +1847,10 @@ int ubi_thread(void *u)
} }
/** /**
* cancel_pending - cancel all pending works. * shutdown_work - shutdown all pending works.
* @ubi: UBI device description object * @ubi: UBI device description object
*/ */
static void cancel_pending(struct ubi_device *ubi) static void shutdown_work(struct ubi_device *ubi)
{ {
while (!list_empty(&ubi->works)) { while (!list_empty(&ubi->works)) {
struct ubi_work *wrk; struct ubi_work *wrk;
@ -1997,7 +1999,7 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
return 0; return 0;
out_free: out_free:
cancel_pending(ubi); shutdown_work(ubi);
tree_destroy(&ubi->used); tree_destroy(&ubi->used);
tree_destroy(&ubi->free); tree_destroy(&ubi->free);
tree_destroy(&ubi->scrub); tree_destroy(&ubi->scrub);
@ -2029,7 +2031,7 @@ static void protection_queue_destroy(struct ubi_device *ubi)
void ubi_wl_close(struct ubi_device *ubi) void ubi_wl_close(struct ubi_device *ubi)
{ {
dbg_wl("close the WL sub-system"); dbg_wl("close the WL sub-system");
cancel_pending(ubi); shutdown_work(ubi);
protection_queue_destroy(ubi); protection_queue_destroy(ubi);
tree_destroy(&ubi->used); tree_destroy(&ubi->used);
tree_destroy(&ubi->erroneous); tree_destroy(&ubi->erroneous);