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

Commit ccfeef0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6 

* 'for-linus' of git://git.infradead.org/ubifs-2.6:
  UBI: do not select KALLSYMS_ALL
  UBI: do not compare array with NULL
  UBI: check if we are in RO mode in the erase routine
  UBIFS: fix debugging failure in dbg_check_space_info
  UBIFS: fix error path in dbg_debugfs_init_fs
  UBIFS: unify error path dbg_debugfs_init_fs
  UBIFS: do not select KALLSYMS_ALL
  UBIFS: fix assertion warnings
  UBIFS: fix oops on error path in read_pnode
  UBIFS: do not read flash unnecessarily
parents 42933bac 6bef0b67

drivers/mtd/ubi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ config MTD_UBI_DEBUG 
	bool "UBI debugging"

	depends on SYSFS

	select DEBUG_FS

	select KALLSYMS_ALL if KALLSYMS && DEBUG_KERNEL

	select KALLSYMS

	help

	  This option enables UBI debugging.

drivers/mtd/ubi/io.c

+7 −1
Original line number Diff line number Diff line
@@ -344,6 +344,12 @@ static int do_sync_erase(struct ubi_device *ubi, int pnum) 
	wait_queue_head_t wq;



	dbg_io("erase PEB %d", pnum);

	ubi_assert(pnum >= 0 && pnum < ubi->peb_count);



	if (ubi->ro_mode) {

		ubi_err("read-only mode");

		return -EROFS;

	}



retry:

	init_waitqueue_head(&wq);
@@ -390,7 +396,7 @@ static int do_sync_erase(struct ubi_device *ubi, int pnum) 
	if (err)

		return err;



	if (ubi_dbg_is_erase_failure() && !err) {

	if (ubi_dbg_is_erase_failure()) {

		dbg_err("cannot erase PEB %d (emulated)", pnum);

		return -EIO;

	}

drivers/mtd/ubi/vmt.c

+0 −5
Original line number Diff line number Diff line
@@ -790,11 +790,6 @@ static int paranoid_check_volume(struct ubi_device *ubi, int vol_id) 
		goto fail;

	}



	if (!vol->name) {

		ubi_err("NULL volume name");

		goto fail;

	}



	n = strnlen(vol->name, vol->name_len + 1);

	if (n != vol->name_len) {

		ubi_err("bad name_len %lld", n);

fs/ubifs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ config UBIFS_FS_DEBUG 
	bool "Enable debugging support"

	depends on UBIFS_FS

	select DEBUG_FS

	select KALLSYMS_ALL

	select KALLSYMS

	help

	  This option enables UBIFS debugging support. It makes sure various

	  assertions, self-checks, debugging messages and test modes are compiled

fs/ubifs/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot) 
	size_t sz;



	if (!(ubifs_chk_flags & UBIFS_CHK_OLD_IDX))

		goto out;

		return 0;



	INIT_LIST_HEAD(&list);