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

Commit 59a7ac12 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 

* 'linux-next' of git://git.infradead.org/ubifs-2.6: (32 commits)
  MAINTAINERS: change e-mail of Adrian Hunter
  UBIFS: fix master node recovery
  UBIFS: improve power cut emulation testing
  UBIFS: rename recovery testing variables
  UBIFS: remove custom list of superblocks
  UBIFS: stop re-defining UBI operations
  UBIFS: switch to I/O helpers
  UBIFS: switch to ubifs_leb_write
  UBIFS: switch to ubifs_leb_read
  UBIFS: introduce more I/O helpers
  UBIFS: always print stacktrace when switching to R/O mode
  UBIFS: remove unused and unneeded debugging function
  UBIFS: add global debugfs knobs
  UBIFS: introduce debugfs helpers
  UBIFS: re-arrange debugging code a bit
  UBIFS: be more informative in failure mode
  UBIFS: switch self-check knobs to debugfs
  UBIFS: lessen amount of debugging check types
  UBIFS: introduce helper functions for debugging checks and tests
  UBIFS: amend debugging inode size check function prototype
  ...
parents f99b7880 cc8f9b99

Documentation/filesystems/ubifs.txt

+0 −28
Original line number Diff line number Diff line
@@ -111,34 +111,6 @@ The following is an example of the kernel boot arguments to attach mtd0 
to UBI and mount volume "rootfs":

ubi.mtd=0 root=ubi0:rootfs rootfstype=ubifs





Module Parameters for Debugging

===============================



When UBIFS has been compiled with debugging enabled, there are 2 module

parameters that are available to control aspects of testing and debugging.



debug_chks	Selects extra checks that UBIFS can do while running:



		Check					Flag value



		General checks				1

		Check Tree Node Cache (TNC)		2

		Check indexing tree size		4

		Check orphan area			8

		Check old indexing tree			16

		Check LEB properties (lprops)		32

		Check leaf nodes and inodes		64



debug_tsts	Selects a mode of testing, as follows:



		Test mode				Flag value



		Failure mode for recovery testing	4



For example, set debug_chks to 3 to enable general and TNC checks.





References

==========

MAINTAINERS

+2 −1
Original line number Diff line number Diff line 




	List of maintainers and how to submit kernel changes



Please try to follow the guidelines below.  This will make things
@@ -6321,7 +6322,7 @@ F: drivers/scsi/u14-34f.c 


UBI FILE SYSTEM (UBIFS)

M:	Artem Bityutskiy <dedekind1@gmail.com>

M:	Adrian Hunter <adrian.hunter@nokia.com>

M:	Adrian Hunter <adrian.hunter@intel.com>

L:	linux-mtd@lists.infradead.org

T:	git git://git.infradead.org/ubifs-2.6.git

W:	http://www.linux-mtd.infradead.org/doc/ubifs.html

fs/ubifs/commit.c

+4 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int nothing_to_commit(struct ubifs_info *c) 
	 * If the root TNC node is dirty, we definitely have something to

	 * commit.

	 */

	if (c->zroot.znode && test_bit(DIRTY_ZNODE, &c->zroot.znode->flags))

	if (c->zroot.znode && ubifs_zn_dirty(c->zroot.znode))

		return 0;



	/*
@@ -418,7 +418,7 @@ int ubifs_run_commit(struct ubifs_info *c) 


	spin_lock(&c->cs_lock);

	if (c->cmt_state == COMMIT_BROKEN) {

		err = -EINVAL;

		err = -EROFS;

		goto out;

	}
@@ -444,7 +444,7 @@ int ubifs_run_commit(struct ubifs_info *c) 
	 * re-check it.

	 */

	if (c->cmt_state == COMMIT_BROKEN) {

		err = -EINVAL;

		err = -EROFS;

		goto out_cmt_unlock;

	}
@@ -576,7 +576,7 @@ int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot) 
	struct idx_node *i;

	size_t sz;



	if (!(ubifs_chk_flags & UBIFS_CHK_OLD_IDX))

	if (!dbg_is_chk_index(c))

		return 0;



	INIT_LIST_HEAD(&list);