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

Commit bdafe42a authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: fix spelling errors and a comment in extent_status tree 



Replace "assertation" with "assertion" in lots and lots of debugging
messages.

Correct the comment stating when ext4_es_insert_extent() is used.  It
was no doubt tree at one point, but it is no longer true...

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: Zheng Liu <gnehzuil.liu@gmail.com>
parent e8974c39

fs/ext4/extents_status.c

+10 −12
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static void ext4_es_insert_extent_ext_check(struct inode *inode, 
		 */

		if (!ext4_es_is_written(es) && !ext4_es_is_unwritten(es)) {

			if (in_range(es->es_lblk, ee_block, ee_len)) {

				pr_warn("ES insert assertation failed for "

				pr_warn("ES insert assertion failed for "

					"inode: %lu we can find an extent "

					"at block [%d/%d/%llu/%c], but we "

					"want to add an delayed/hole extent "
@@ -458,7 +458,7 @@ static void ext4_es_insert_extent_ext_check(struct inode *inode, 
		 */

		if (es->es_lblk < ee_block ||

		    ext4_es_pblock(es) != ee_start + es->es_lblk - ee_block) {

			pr_warn("ES insert assertation failed for inode: %lu "

			pr_warn("ES insert assertion failed for inode: %lu "

				"ex_status [%d/%d/%llu/%c] != "

				"es_status [%d/%d/%llu/%c]\n", inode->i_ino,

				ee_block, ee_len, ee_start,
@@ -468,7 +468,7 @@ static void ext4_es_insert_extent_ext_check(struct inode *inode, 
		}



		if (ee_status ^ es_status) {

			pr_warn("ES insert assertation failed for inode: %lu "

			pr_warn("ES insert assertion failed for inode: %lu "

				"ex_status [%d/%d/%llu/%c] != "

				"es_status [%d/%d/%llu/%c]\n", inode->i_ino,

				ee_block, ee_len, ee_start,
@@ -481,7 +481,7 @@ static void ext4_es_insert_extent_ext_check(struct inode *inode, 
		 * that we don't want to add an written/unwritten extent.

		 */

		if (!ext4_es_is_delayed(es) && !ext4_es_is_hole(es)) {

			pr_warn("ES insert assertation failed for inode: %lu "

			pr_warn("ES insert assertion failed for inode: %lu "

				"can't find an extent at block %d but we want "

				"to add an written/unwritten extent "

				"[%d/%d/%llu/%llx]\n", inode->i_ino,
@@ -519,7 +519,7 @@ static void ext4_es_insert_extent_ind_check(struct inode *inode, 
			 * We want to add a delayed/hole extent but this

			 * block has been allocated.

			 */

			pr_warn("ES insert assertation failed for inode: %lu "

			pr_warn("ES insert assertion failed for inode: %lu "

				"We can find blocks but we want to add a "

				"delayed/hole extent [%d/%d/%llu/%llx]\n",

				inode->i_ino, es->es_lblk, es->es_len,
@@ -527,13 +527,13 @@ static void ext4_es_insert_extent_ind_check(struct inode *inode, 
			return;

		} else if (ext4_es_is_written(es)) {

			if (retval != es->es_len) {

				pr_warn("ES insert assertation failed for "

				pr_warn("ES insert assertion failed for "

					"inode: %lu retval %d != es_len %d\n",

					inode->i_ino, retval, es->es_len);

				return;

			}

			if (map.m_pblk != ext4_es_pblock(es)) {

				pr_warn("ES insert assertation failed for "

				pr_warn("ES insert assertion failed for "

					"inode: %lu m_pblk %llu != "

					"es_pblk %llu\n",

					inode->i_ino, map.m_pblk,
@@ -549,7 +549,7 @@ static void ext4_es_insert_extent_ind_check(struct inode *inode, 
		}

	} else if (retval == 0) {

		if (ext4_es_is_written(es)) {

			pr_warn("ES insert assertation failed for inode: %lu "

			pr_warn("ES insert assertion failed for inode: %lu "

				"We can't find the block but we want to add "

				"an written extent [%d/%d/%llu/%llx]\n",

				inode->i_ino, es->es_lblk, es->es_len,
@@ -632,10 +632,8 @@ static int __es_insert_extent(struct inode *inode, struct extent_status *newes) 
}



/*

 * ext4_es_insert_extent() adds a space to a extent status tree.

 *

 * ext4_es_insert_extent is called by ext4_da_write_begin and

 * ext4_es_remove_extent.

 * ext4_es_insert_extent() adds information to an inode's extent

 * status tree.

 *

 * Return 0 on success, error code on failure.

 */

fs/ext4/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static void ext4_map_blocks_es_recheck(handle_t *handle, 
	if (es_map->m_lblk != map->m_lblk ||

	    es_map->m_flags != map->m_flags ||

	    es_map->m_pblk != map->m_pblk) {

		printk("ES cache assertation failed for inode: %lu "

		printk("ES cache assertion failed for inode: %lu "

		       "es_cached ex [%d/%d/%llu/%x] != "

		       "found ex [%d/%d/%llu/%x] retval %d flags %x\n",

		       inode->i_ino, es_map->m_lblk, es_map->m_len,
@@ -558,7 +558,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, 


#ifdef ES_AGGRESSIVE_TEST

		if (retval != map->m_len) {

			printk("ES len assertation failed for inode: %lu "

			printk("ES len assertion failed for inode: %lu "

			       "retval %d != map->m_len %d "

			       "in %s (lookup)\n", inode->i_ino, retval,

			       map->m_len, __func__);
@@ -659,7 +659,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, 


#ifdef ES_AGGRESSIVE_TEST

		if (retval != map->m_len) {

			printk("ES len assertation failed for inode: %lu "

			printk("ES len assertion failed for inode: %lu "

			       "retval %d != map->m_len %d "

			       "in %s (allocation)\n", inode->i_ino, retval,

			       map->m_len, __func__);
@@ -1642,7 +1642,7 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, 


#ifdef ES_AGGRESSIVE_TEST

		if (retval != map->m_len) {

			printk("ES len assertation failed for inode: %lu "

			printk("ES len assertion failed for inode: %lu "

			       "retval %d != map->m_len %d "

			       "in %s (lookup)\n", inode->i_ino, retval,

			       map->m_len, __func__);