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

Commit 64575574 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Artem Bityutskiy
Browse files

UBI: introduce helpers dbg_chk_{io, gen} 



With this patch code is a bit more readable and there's no
generated code or functionality impact.
Furthermore, this abstracts implementation details and
will allow to change ubi_debug_info in a less invasive way.

Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent d856c13c

drivers/mtd/ubi/attach.c

+2 −2
Original line number Diff line number Diff line
@@ -1448,7 +1448,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) 
		goto out_wl;



#ifdef CONFIG_MTD_UBI_FASTMAP

	if (ubi->fm && ubi->dbg->chk_gen) {

	if (ubi->fm && ubi_dbg_chk_gen(ubi)) {

		struct ubi_attach_info *scan_ai;



		scan_ai = alloc_ai("ubi_ckh_aeb_slab_cache");
@@ -1498,7 +1498,7 @@ static int self_check_ai(struct ubi_device *ubi, struct ubi_attach_info *ai) 
	struct ubi_ainf_peb *aeb, *last_aeb;

	uint8_t *buf;



	if (!ubi->dbg->chk_gen)

	if (!ubi_dbg_chk_gen(ubi))

		return 0;



	/*

drivers/mtd/ubi/debug.h

+9 −0
Original line number Diff line number Diff line
@@ -158,4 +158,13 @@ static inline int ubi_dbg_is_erase_failure(const struct ubi_device *ubi) 
	return 0;

}



static inline int ubi_dbg_chk_io(const struct ubi_device *ubi)

{

	return ubi->dbg->chk_io;

}



static inline int ubi_dbg_chk_gen(const struct ubi_device *ubi)

{

	return ubi->dbg->chk_gen;

}

#endif /* !__UBI_DEBUG_H__ */

drivers/mtd/ubi/io.c

+7 −7
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ static int self_check_not_bad(const struct ubi_device *ubi, int pnum) 
{

	int err;



	if (!ubi->dbg->chk_io)

	if (!ubi_dbg_chk_io(ubi))

		return 0;



	err = ubi_io_is_bad(ubi, pnum);
@@ -1159,7 +1159,7 @@ static int self_check_ec_hdr(const struct ubi_device *ubi, int pnum, 
	int err;

	uint32_t magic;



	if (!ubi->dbg->chk_io)

	if (!ubi_dbg_chk_io(ubi))

		return 0;



	magic = be32_to_cpu(ec_hdr->magic);
@@ -1197,7 +1197,7 @@ static int self_check_peb_ec_hdr(const struct ubi_device *ubi, int pnum) 
	uint32_t crc, hdr_crc;

	struct ubi_ec_hdr *ec_hdr;



	if (!ubi->dbg->chk_io)

	if (!ubi_dbg_chk_io(ubi))

		return 0;



	ec_hdr = kzalloc(ubi->ec_hdr_alsize, GFP_NOFS);
@@ -1241,7 +1241,7 @@ static int self_check_vid_hdr(const struct ubi_device *ubi, int pnum, 
	int err;

	uint32_t magic;



	if (!ubi->dbg->chk_io)

	if (!ubi_dbg_chk_io(ubi))

		return 0;



	magic = be32_to_cpu(vid_hdr->magic);
@@ -1282,7 +1282,7 @@ static int self_check_peb_vid_hdr(const struct ubi_device *ubi, int pnum) 
	struct ubi_vid_hdr *vid_hdr;

	void *p;



	if (!ubi->dbg->chk_io)

	if (!ubi_dbg_chk_io(ubi))

		return 0;



	vid_hdr = ubi_zalloc_vid_hdr(ubi, GFP_NOFS);
@@ -1334,7 +1334,7 @@ static int self_check_write(struct ubi_device *ubi, const void *buf, int pnum, 
	void *buf1;

	loff_t addr = (loff_t)pnum * ubi->peb_size + offset;



	if (!ubi->dbg->chk_io)

	if (!ubi_dbg_chk_io(ubi))

		return 0;



	buf1 = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
@@ -1398,7 +1398,7 @@ int ubi_self_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len) 
	void *buf;

	loff_t addr = (loff_t)pnum * ubi->peb_size + offset;



	if (!ubi->dbg->chk_io)

	if (!ubi_dbg_chk_io(ubi))

		return 0;



	buf = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);

drivers/mtd/ubi/vmt.c

+1 −1
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static int self_check_volumes(struct ubi_device *ubi) 
{

	int i, err = 0;



	if (!ubi->dbg->chk_gen)

	if (!ubi_dbg_chk_gen(ubi))

		return 0;



	for (i = 0; i < ubi->vtbl_slots; i++) {

drivers/mtd/ubi/vtbl.c

+1 −1
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_attach_info *ai) 
 */

static void self_vtbl_check(const struct ubi_device *ubi)

{

	if (!ubi->dbg->chk_gen)

	if (!ubi_dbg_chk_gen(ubi))

		return;



	if (vtbl_check(ubi, ubi->vtbl)) {