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

Commit 2c5ec5ce authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by Artem Bityutskiy
Browse files

UBI: rename seb to aeb 



After re-naming the 'struct ubi_scan_leb' we should adjust all variables
named 'seb' to something else, because 'seb' stands for "scanning eraseblock".
Let's rename it to 'aeb' which stands for "attaching eraseblock" which is
a bit more consistend and has the same length.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
parent 55e93e55

drivers/mtd/ubi/debug.c

+8 −8
Original line number Diff line number Diff line
@@ -188,19 +188,19 @@ void ubi_dump_sv(const struct ubi_ainf_volume *sv) 
}



/**

 * ubi_dump_seb - dump a &struct ubi_ainf_peb object.

 * @seb: the object to dump

 * ubi_dump_aeb - dump a &struct ubi_ainf_peb object.

 * @aeb: the object to dump

 * @type: object type: 0 - not corrupted, 1 - corrupted

 */

void ubi_dump_seb(const struct ubi_ainf_peb *seb, int type)

void ubi_dump_aeb(const struct ubi_ainf_peb *aeb, int type)

{

	printk(KERN_DEBUG "eraseblock scanning information dump:\n");

	printk(KERN_DEBUG "\tec       %d\n", seb->ec);

	printk(KERN_DEBUG "\tpnum     %d\n", seb->pnum);

	printk(KERN_DEBUG "\tec       %d\n", aeb->ec);

	printk(KERN_DEBUG "\tpnum     %d\n", aeb->pnum);

	if (type == 0) {

		printk(KERN_DEBUG "\tlnum     %d\n", seb->lnum);

		printk(KERN_DEBUG "\tscrub    %d\n", seb->scrub);

		printk(KERN_DEBUG "\tsqnum    %llu\n", seb->sqnum);

		printk(KERN_DEBUG "\tlnum     %d\n", aeb->lnum);

		printk(KERN_DEBUG "\tscrub    %d\n", aeb->scrub);

		printk(KERN_DEBUG "\tsqnum    %llu\n", aeb->sqnum);

	}

}

drivers/mtd/ubi/debug.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr); 
void ubi_dump_vol_info(const struct ubi_volume *vol);

void ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx);

void ubi_dump_sv(const struct ubi_ainf_volume *sv);

void ubi_dump_seb(const struct ubi_ainf_peb *seb, int type);

void ubi_dump_aeb(const struct ubi_ainf_peb *aeb, int type);

void ubi_dump_mkvol_req(const struct ubi_mkvol_req *req);

int ubi_self_check_all_ff(struct ubi_device *ubi, int pnum, int offset,

			  int len);

drivers/mtd/ubi/eba.c

+5 −5
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_attach_info *si) 
	int i, j, err, num_volumes;

	struct ubi_ainf_volume *sv;

	struct ubi_volume *vol;

	struct ubi_ainf_peb *seb;

	struct ubi_ainf_peb *aeb;

	struct rb_node *rb;



	dbg_eba("initialize EBA sub-system");
@@ -1250,14 +1250,14 @@ int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_attach_info *si) 
		if (!sv)

			continue;



		ubi_rb_for_each_entry(rb, seb, &sv->root, u.rb) {

			if (seb->lnum >= vol->reserved_pebs)

		ubi_rb_for_each_entry(rb, aeb, &sv->root, u.rb) {

			if (aeb->lnum >= vol->reserved_pebs)

				/*

				 * This may happen in case of an unclean reboot

				 * during re-size.

				 */

				ubi_scan_move_to_list(sv, seb, &si->erase);

			vol->eba_tbl[seb->lnum] = seb->pnum;

				ubi_scan_move_to_list(sv, aeb, &si->erase);

			vol->eba_tbl[aeb->lnum] = aeb->pnum;

		}

	}

drivers/mtd/ubi/scan.c

+148 −148

File changed.

Preview size limit exceeded, changes collapsed.

drivers/mtd/ubi/scan.h

+5 −5
Original line number Diff line number Diff line
@@ -146,15 +146,15 @@ struct ubi_vid_hdr; 
 * ubi_scan_move_to_list - move a PEB from the volume tree to a list.

 *

 * @sv: volume scanning information

 * @seb: scanning eraseblock information

 * @aeb: scanning eraseblock information

 * @list: the list to move to

 */

static inline void ubi_scan_move_to_list(struct ubi_ainf_volume *sv,

					 struct ubi_ainf_peb *seb,

					 struct ubi_ainf_peb *aeb,

					 struct list_head *list)

{

		rb_erase(&seb->u.rb, &sv->root);

		list_add_tail(&seb->u.list, list);

		rb_erase(&aeb->u.rb, &sv->root);

		list_add_tail(&aeb->u.list, list);

}



int ubi_scan_add_used(struct ubi_device *ubi, struct ubi_attach_info *si,
@@ -162,7 +162,7 @@ int ubi_scan_add_used(struct ubi_device *ubi, struct ubi_attach_info *si, 
		      int bitflips);

struct ubi_ainf_volume *ubi_scan_find_sv(const struct ubi_attach_info *si,

					 int vol_id);

struct ubi_ainf_peb *ubi_scan_find_seb(const struct ubi_ainf_volume *sv,

struct ubi_ainf_peb *ubi_scan_find_aeb(const struct ubi_ainf_volume *sv,

				       int lnum);

void ubi_scan_rm_volume(struct ubi_attach_info *si, struct ubi_ainf_volume *sv);

struct ubi_ainf_peb *ubi_scan_get_free_peb(struct ubi_device *ubi,