Commit 2cb81e21 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: small debugging code optimization 



The @ubi->dbg_peb_buf is needed only when paranoid checks are
enabled, not when debugging in general is enabled.

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

drivers/mtd/ubi/build.c

+3 −3
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset) 
	if (!ubi->peb_buf2)

		goto out_free;



#ifdef CONFIG_MTD_UBI_DEBUG

#ifdef CONFIG_MTD_UBI_DEBUG_PARANOID

	mutex_init(&ubi->dbg_buf_mutex);

	ubi->dbg_peb_buf = vmalloc(ubi->peb_size);

	if (!ubi->dbg_peb_buf)
@@ -891,7 +891,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset) 
out_free:

	vfree(ubi->peb_buf1);

	vfree(ubi->peb_buf2);

#ifdef CONFIG_MTD_UBI_DEBUG

#ifdef CONFIG_MTD_UBI_DEBUG_PARANOID

	vfree(ubi->dbg_peb_buf);

#endif

	kfree(ubi);
@@ -960,7 +960,7 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway) 
	put_mtd_device(ubi->mtd);

	vfree(ubi->peb_buf1);

	vfree(ubi->peb_buf2);

#ifdef CONFIG_MTD_UBI_DEBUG

#ifdef CONFIG_MTD_UBI_DEBUG_PARANOID

	vfree(ubi->dbg_peb_buf);

#endif

	ubi_msg("mtd%d is detached from ubi%d", ubi->mtd->index, ubi->ubi_num);

drivers/mtd/ubi/ubi.h

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ struct ubi_device { 
	void *peb_buf2;

	struct mutex buf_mutex;

	struct mutex ckvol_mutex;

#ifdef CONFIG_MTD_UBI_DEBUG

#ifdef CONFIG_MTD_UBI_DEBUG_PARANOID

	void *dbg_peb_buf;

	struct mutex dbg_buf_mutex;

#endif