Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a8f483f authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: some code re-structuring 



Minor code re-structuring and commentaries fixes to improve readability.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 4df581f3

drivers/mtd/ubi/wl.c

+23 −16
Original line number Original line Diff line number Diff line
@@ -359,19 +359,18 @@ static int in_wl_tree(struct ubi_wl_entry *e, struct rb_root *root) 
 * @ubi: UBI device description object

 * @ubi: UBI device description object

 * @e: the physical eraseblock to add

 * @e: the physical eraseblock to add

 * @pe: protection entry object to use

 * @pe: protection entry object to use

 * @abs_ec: absolute erase counter value when this physical eraseblock has

 * @ec: for how many erase operations this PEB should be protected

 * to be removed from the protection trees.

 *

 *

 * @wl->lock has to be locked.

 * @wl->lock has to be locked.

 */

 */

static void prot_tree_add(struct ubi_device *ubi, struct ubi_wl_entry *e,

static void prot_tree_add(struct ubi_device *ubi, struct ubi_wl_entry *e,

			  struct ubi_wl_prot_entry *pe, int abs_ec)

			  struct ubi_wl_prot_entry *pe, int ec)

{

{

	struct rb_node **p, *parent = NULL;

	struct rb_node **p, *parent = NULL;

	struct ubi_wl_prot_entry *pe1;

	struct ubi_wl_prot_entry *pe1;





	pe->e = e;

	pe->e = e;

	pe->abs_ec = ubi->abs_ec + abs_ec;

	pe->abs_ec = ubi->abs_ec + ec;





	p = &ubi->prot.pnum.rb_node;

	p = &ubi->prot.pnum.rb_node;

	while (*p) {

	while (*p) {
@@ -739,7 +738,7 @@ static int schedule_erase(struct ubi_device *ubi, struct ubi_wl_entry *e, 
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 cancel)

{

{

	int err, put = 0, scrubbing = 0, protect = 0;

	int err, put = 0, scrubbing = 0;

	struct ubi_wl_prot_entry *uninitialized_var(pe);

	struct ubi_wl_prot_entry *uninitialized_var(pe);

	struct ubi_wl_entry *e1, *e2;

	struct ubi_wl_entry *e1, *e2;

	struct ubi_vid_hdr *vid_hdr;

	struct ubi_vid_hdr *vid_hdr;
@@ -864,17 +863,28 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, 
			goto out_error;

			goto out_error;

		}

		}





		protect = 1;

		ubi_free_vid_hdr(ubi, vid_hdr);

		spin_lock(&ubi->wl_lock);

		prot_tree_add(ubi, e1, pe, U_PROTECTION);

		ubi_assert(!ubi->move_to_put);

		ubi->move_from = ubi->move_to = NULL;

		ubi->wl_scheduled = 0;

		spin_unlock(&ubi->wl_lock);



		err = schedule_erase(ubi, e2, 0);

		if (err)

			goto out_error;

		mutex_unlock(&ubi->move_mutex);

		return 0;

	}

	}





	/* The PEB has been successfully moved */

	ubi_free_vid_hdr(ubi, vid_hdr);

	ubi_free_vid_hdr(ubi, vid_hdr);

	if (scrubbing && !protect)

	if (scrubbing)

		ubi_msg("scrubbed PEB %d, data moved to PEB %d",

		ubi_msg("scrubbed PEB %d, data moved to PEB %d",

			e1->pnum, e2->pnum);

			e1->pnum, e2->pnum);





	spin_lock(&ubi->wl_lock);

	spin_lock(&ubi->wl_lock);

	if (protect)

		prot_tree_add(ubi, e1, pe, protect);

	if (!ubi->move_to_put)

	if (!ubi->move_to_put)

		wl_tree_add(e2, &ubi->used);

		wl_tree_add(e2, &ubi->used);

	else

	else
@@ -883,6 +893,10 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, 
	ubi->move_to_put = ubi->wl_scheduled = 0;

	ubi->move_to_put = ubi->wl_scheduled = 0;

	spin_unlock(&ubi->wl_lock);

	spin_unlock(&ubi->wl_lock);





	err = schedule_erase(ubi, e1, 0);

	if (err)

		goto out_error;



	if (put) {

	if (put) {

		/*

		/*

		 * Well, the target PEB was put meanwhile, schedule it for

		 * Well, the target PEB was put meanwhile, schedule it for
@@ -894,13 +908,6 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, 
			goto out_error;

			goto out_error;

	}

	}





	if (!protect) {

		err = schedule_erase(ubi, e1, 0);

		if (err)

			goto out_error;

	}





	dbg_wl("done");

	dbg_wl("done");

	mutex_unlock(&ubi->move_mutex);

	mutex_unlock(&ubi->move_mutex);

	return 0;

	return 0;