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

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

ext4: rename ext4_ext_find_extent() to ext4_find_extent() 



Make the function name less redundant.

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 3bdf14b4

fs/ext4/ext4.h

+4 −4
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ enum { 


/*

 * The bit position of these flags must not overlap with any of the

 * EXT4_GET_BLOCKS_*.  They are used by ext4_ext_find_extent(),

 * EXT4_GET_BLOCKS_*.  They are used by ext4_find_extent(),

 * read_extent_tree_block(), ext4_split_extent_at(),

 * ext4_ext_insert_extent(), and ext4_ext_create_new_leaf().

 * EXT4_EX_NOCACHE is used to indicate that the we shouldn't be
@@ -2732,7 +2732,7 @@ extern int ext4_can_extents_be_merged(struct inode *inode, 
extern int ext4_ext_insert_extent(handle_t *, struct inode *,

				  struct ext4_ext_path **,

				  struct ext4_extent *, int);

extern struct ext4_ext_path *ext4_ext_find_extent(struct inode *, ext4_lblk_t,

extern struct ext4_ext_path *ext4_find_extent(struct inode *, ext4_lblk_t,

					      struct ext4_ext_path **,

					      int flags);

extern void ext4_ext_drop_refs(struct ext4_ext_path *);

fs/ext4/extents.c

+19 −19
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ int ext4_ext_tree_init(handle_t *handle, struct inode *inode) 
}



struct ext4_ext_path *

ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block,

ext4_find_extent(struct inode *inode, ext4_lblk_t block,

		 struct ext4_ext_path **orig_path, int flags)

{

	struct ext4_extent_header *eh;
@@ -1366,7 +1366,7 @@ static int ext4_ext_create_new_leaf(handle_t *handle, struct inode *inode, 
			goto out;



		/* refill path */

		path = ext4_ext_find_extent(inode,

		path = ext4_find_extent(inode,

				    (ext4_lblk_t)le32_to_cpu(newext->ee_block),

				    ppath, gb_flags);

		if (IS_ERR(path))
@@ -1378,7 +1378,7 @@ static int ext4_ext_create_new_leaf(handle_t *handle, struct inode *inode, 
			goto out;



		/* refill path */

		path = ext4_ext_find_extent(inode,

		path = ext4_find_extent(inode,

				   (ext4_lblk_t)le32_to_cpu(newext->ee_block),

				    ppath, gb_flags);

		if (IS_ERR(path)) {
@@ -1951,7 +1951,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, 
		/*

		 * Try to see whether we should rather test the extent on

		 * right from ex, or from the left of ex. This is because

		 * ext4_ext_find_extent() can return either extent on the

		 * ext4_find_extent() can return either extent on the

		 * left, or on the right from the searched position. This

		 * will make merging more effective.

		 */
@@ -2034,7 +2034,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, 
	if (next != EXT_MAX_BLOCKS) {

		ext_debug("next leaf block - %u\n", next);

		BUG_ON(npath != NULL);

		npath = ext4_ext_find_extent(inode, next, NULL, 0);

		npath = ext4_find_extent(inode, next, NULL, 0);

		if (IS_ERR(npath))

			return PTR_ERR(npath);

		BUG_ON(npath->p_depth != path->p_depth);
@@ -2157,7 +2157,7 @@ static int ext4_fill_fiemap_extents(struct inode *inode, 
		/* find extent for this block */

		down_read(&EXT4_I(inode)->i_data_sem);



		path = ext4_ext_find_extent(inode, block, &path, 0);

		path = ext4_find_extent(inode, block, &path, 0);

		if (IS_ERR(path)) {

			up_read(&EXT4_I(inode)->i_data_sem);

			err = PTR_ERR(path);
@@ -2840,7 +2840,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start, 
		ext4_lblk_t ee_block;



		/* find extent for this block */

		path = ext4_ext_find_extent(inode, end, NULL, EXT4_EX_NOCACHE);

		path = ext4_find_extent(inode, end, NULL, EXT4_EX_NOCACHE);

		if (IS_ERR(path)) {

			ext4_journal_stop(handle);

			return PTR_ERR(path);
@@ -3314,7 +3314,7 @@ static int ext4_split_extent(handle_t *handle, 
	 * Update path is required because previous ext4_split_extent_at() may

	 * result in split of original leaf or extent zeroout.

	 */

	path = ext4_ext_find_extent(inode, map->m_lblk, ppath, 0);

	path = ext4_find_extent(inode, map->m_lblk, ppath, 0);

	if (IS_ERR(path))

		return PTR_ERR(path);

	depth = ext_depth(inode);
@@ -3712,7 +3712,7 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle, 
						 EXT4_GET_BLOCKS_CONVERT);

		if (err < 0)

			return err;

		path = ext4_ext_find_extent(inode, map->m_lblk, ppath, 0);

		path = ext4_find_extent(inode, map->m_lblk, ppath, 0);

		if (IS_ERR(path))

			return PTR_ERR(path);

		depth = ext_depth(inode);
@@ -3940,7 +3940,7 @@ convert_initialized_extent(handle_t *handle, struct inode *inode, 
				EXT4_GET_BLOCKS_CONVERT_UNWRITTEN);

		if (err < 0)

			return err;

		path = ext4_ext_find_extent(inode, map->m_lblk, ppath, 0);

		path = ext4_find_extent(inode, map->m_lblk, ppath, 0);

		if (IS_ERR(path))

			return PTR_ERR(path);

		depth = ext_depth(inode);
@@ -4266,7 +4266,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, 
	trace_ext4_ext_map_blocks_enter(inode, map->m_lblk, map->m_len, flags);



	/* find extent for this block */

	path = ext4_ext_find_extent(inode, map->m_lblk, NULL, 0);

	path = ext4_find_extent(inode, map->m_lblk, NULL, 0);

	if (IS_ERR(path)) {

		err = PTR_ERR(path);

		path = NULL;
@@ -4278,7 +4278,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, 
	/*

	 * consistent leaf must not be empty;

	 * this situation is possible, though, _during_ tree modification;

	 * this is why assert can't be put in ext4_ext_find_extent()

	 * this is why assert can't be put in ext4_find_extent()

	 */

	if (unlikely(path[depth].p_ext == NULL && depth != 0)) {

		EXT4_ERROR_INODE(inode, "bad extent address "
@@ -4363,7 +4363,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, 


	/*

	 * If we are doing bigalloc, check to see if the extent returned

	 * by ext4_ext_find_extent() implies a cluster we can use.

	 * by ext4_find_extent() implies a cluster we can use.

	 */

	if (cluster_offset && ex &&

	    get_implied_cluster_alloc(inode->i_sb, map, ex, path)) {
@@ -5300,7 +5300,7 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle, 
	ext4_lblk_t ex_start, ex_end;



	/* Let path point to the last extent */

	path = ext4_ext_find_extent(inode, EXT_MAX_BLOCKS - 1, NULL, 0);

	path = ext4_find_extent(inode, EXT_MAX_BLOCKS - 1, NULL, 0);

	if (IS_ERR(path))

		return PTR_ERR(path);
@@ -5320,7 +5320,7 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle, 
	 * Don't start shifting extents until we make sure the hole is big

	 * enough to accomodate the shift.

	 */

	path = ext4_ext_find_extent(inode, start - 1, &path, 0);

	path = ext4_find_extent(inode, start - 1, &path, 0);

	if (IS_ERR(path))

		return PTR_ERR(path);

	depth = path->p_depth;
@@ -5340,7 +5340,7 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle, 


	/* Its safe to start updating extents */

	while (start < stop_block) {

		path = ext4_ext_find_extent(inode, start, &path, 0);

		path = ext4_find_extent(inode, start, &path, 0);

		if (IS_ERR(path))

			return PTR_ERR(path);

		depth = path->p_depth;
@@ -5537,7 +5537,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1, 
		int e1_len, e2_len, len;

		int split = 0;



		path1 = ext4_ext_find_extent(inode1, lblk1, NULL, EXT4_EX_NOCACHE);

		path1 = ext4_find_extent(inode1, lblk1, NULL, EXT4_EX_NOCACHE);

		if (unlikely(IS_ERR(path1))) {

			*erp = PTR_ERR(path1);

			path1 = NULL;
@@ -5545,7 +5545,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1, 
			count = 0;

			goto repeat;

		}

		path2 = ext4_ext_find_extent(inode2, lblk2, NULL, EXT4_EX_NOCACHE);

		path2 = ext4_find_extent(inode2, lblk2, NULL, EXT4_EX_NOCACHE);

		if (unlikely(IS_ERR(path2))) {

			*erp = PTR_ERR(path2);

			path2 = NULL;

fs/ext4/extents_status.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static void ext4_es_insert_extent_ext_check(struct inode *inode, 
	unsigned short ee_len;

	int depth, ee_status, es_status;



	path = ext4_ext_find_extent(inode, es->es_lblk, NULL, EXT4_EX_NOCACHE);

	path = ext4_find_extent(inode, es->es_lblk, NULL, EXT4_EX_NOCACHE);

	if (IS_ERR(path))

		return;

fs/ext4/migrate.c

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ static int finish_range(handle_t *handle, struct inode *inode, 
	ext4_ext_store_pblock(&newext, lb->first_pblock);

	/* Locking only for convinience since we are operating on temp inode */

	down_write(&EXT4_I(inode)->i_data_sem);

	path = ext4_ext_find_extent(inode, lb->first_block, NULL, 0);



	path = ext4_find_extent(inode, lb->first_block, NULL, 0);

	if (IS_ERR(path)) {

		retval = PTR_ERR(path);

		path = NULL;

fs/ext4/move_extent.c

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 * @lblock:	logical block number to find an extent path

 * @path:	pointer to an extent path pointer (for output)

 *

 * ext4_ext_find_extent wrapper. Return 0 on success, or a negative error value

 * ext4_find_extent wrapper. Return 0 on success, or a negative error value

 * on failure.

 */

static inline int
@@ -36,7 +36,7 @@ get_ext_path(struct inode *inode, ext4_lblk_t lblock, 
{

	struct ext4_ext_path *path;



	path = ext4_ext_find_extent(inode, lblock, ppath, EXT4_EX_NOCACHE);

	path = ext4_find_extent(inode, lblock, ppath, EXT4_EX_NOCACHE);

	if (IS_ERR(path))

		return PTR_ERR(path);

	if (path[ext_depth(inode)].p_ext == NULL) {