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

Commit 79e83036 authored by Eric Sandeen's avatar Eric Sandeen Committed by Theodore Ts'o
Browse files

ext4: fix ext4_get_blocks references 



ext4_get_blocks got renamed to ext4_map_blocks, but left stale
comments and a prototype littered around.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 62d2b5f2

fs/ext4/ext4.h

+1 −4
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ struct ext4_new_group_data { 
};



/*

 * Flags used by ext4_get_blocks()

 * Flags used by ext4_map_blocks()

 */

	/* Allocate any needed blocks and/or convert an unitialized

	   extent to be an initialized ext4 */
@@ -1954,9 +1954,6 @@ extern int ext4_convert_unwritten_extents(struct inode *inode, loff_t offset, 
			  ssize_t len);

extern int ext4_map_blocks(handle_t *handle, struct inode *inode,

			   struct ext4_map_blocks *map, int flags);

extern int ext4_get_blocks(handle_t *handle, struct inode *inode,

			   sector_t block, unsigned int max_blocks,

			   struct buffer_head *bh, int flags);

extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

			__u64 start, __u64 len);

/* move_extent.c */

fs/ext4/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -2201,7 +2201,7 @@ static int mpage_da_map_blocks(struct mpage_da_data *mpd) 
	BUG_ON(!handle);



	/*

	 * Call ext4_get_blocks() to allocate any delayed allocation

	 * Call ext4_map_blocks() to allocate any delayed allocation

	 * blocks, or to convert an uninitialized extent to be

	 * initialized (in the case where we have written into

	 * one or more preallocated blocks).
@@ -2210,7 +2210,7 @@ static int mpage_da_map_blocks(struct mpage_da_data *mpd) 
	 * indicate that we are on the delayed allocation path.  This

	 * affects functions in many different parts of the allocation

	 * call path.  This flag exists primarily because we don't

	 * want to change *many* call functions, so ext4_get_blocks()

	 * want to change *many* call functions, so ext4_map_blocks()

	 * will set the magic i_delalloc_reserved_flag once the

	 * inode's allocation semaphore is taken.

	 *
@@ -2327,7 +2327,7 @@ static void mpage_add_bh_to_extent(struct mpage_da_data *mpd, 
	 * XXX Don't go larger than mballoc is willing to allocate

	 * This is a stopgap solution.  We eventually need to fold

	 * mpage_da_submit_io() into this function and then call

	 * ext4_get_blocks() multiple times in a loop

	 * ext4_map_blocks() multiple times in a loop

	 */

	if (nrblocks >= 8*1024*1024/mpd->inode->i_sb->s_blocksize)

		goto flush_it;
@@ -3948,7 +3948,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb, 
				return -ENOMEM;

			/*

			 * we save the io structure for current async

			 * direct IO, so that later ext4_get_blocks()

			 * direct IO, so that later ext4_map_blocks()

			 * could flag the io structure whether there

			 * is a unwritten extents needs to be converted

			 * when IO is completed.
@@ -5675,7 +5675,7 @@ int ext4_writepage_trans_blocks(struct inode *inode) 
 * Calculate the journal credits for a chunk of data modification.

 *

 * This is called from DIO, fallocate or whoever calling

 * ext4_get_blocks() to map/allocate a chunk of contiguous disk blocks.

 * ext4_map_blocks() to map/allocate a chunk of contiguous disk blocks.

 *

 * journal buffers for data blocks are not included here, as DIO

 * and fallocate do no need to journal data buffers.