diff options
author | Eric Sandeen <sandeen@redhat.com> | 2010-07-27 11:56:07 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-07-27 11:56:07 -0400 |
commit | 79e8303677fc15f508b9877e0fea1925c4add6f3 (patch) | |
tree | 85891ab05b2a9e5dd47966fd16bc372df6d4bb88 /fs/ext4/inode.c | |
parent | 62d2b5f2dcd3707b070efb16bbfdf6947c38c194 (diff) |
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: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 38ec77fc3279..8279ad73b929 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -2201,7 +2201,7 @@ static int mpage_da_map_blocks(struct mpage_da_data *mpd) | |||
2201 | BUG_ON(!handle); | 2201 | BUG_ON(!handle); |
2202 | 2202 | ||
2203 | /* | 2203 | /* |
2204 | * Call ext4_get_blocks() to allocate any delayed allocation | 2204 | * Call ext4_map_blocks() to allocate any delayed allocation |
2205 | * blocks, or to convert an uninitialized extent to be | 2205 | * blocks, or to convert an uninitialized extent to be |
2206 | * initialized (in the case where we have written into | 2206 | * initialized (in the case where we have written into |
2207 | * one or more preallocated blocks). | 2207 | * one or more preallocated blocks). |
@@ -2210,7 +2210,7 @@ static int mpage_da_map_blocks(struct mpage_da_data *mpd) | |||
2210 | * indicate that we are on the delayed allocation path. This | 2210 | * indicate that we are on the delayed allocation path. This |
2211 | * affects functions in many different parts of the allocation | 2211 | * affects functions in many different parts of the allocation |
2212 | * call path. This flag exists primarily because we don't | 2212 | * call path. This flag exists primarily because we don't |
2213 | * want to change *many* call functions, so ext4_get_blocks() | 2213 | * want to change *many* call functions, so ext4_map_blocks() |
2214 | * will set the magic i_delalloc_reserved_flag once the | 2214 | * will set the magic i_delalloc_reserved_flag once the |
2215 | * inode's allocation semaphore is taken. | 2215 | * inode's allocation semaphore is taken. |
2216 | * | 2216 | * |
@@ -2327,7 +2327,7 @@ static void mpage_add_bh_to_extent(struct mpage_da_data *mpd, | |||
2327 | * XXX Don't go larger than mballoc is willing to allocate | 2327 | * XXX Don't go larger than mballoc is willing to allocate |
2328 | * This is a stopgap solution. We eventually need to fold | 2328 | * This is a stopgap solution. We eventually need to fold |
2329 | * mpage_da_submit_io() into this function and then call | 2329 | * mpage_da_submit_io() into this function and then call |
2330 | * ext4_get_blocks() multiple times in a loop | 2330 | * ext4_map_blocks() multiple times in a loop |
2331 | */ | 2331 | */ |
2332 | if (nrblocks >= 8*1024*1024/mpd->inode->i_sb->s_blocksize) | 2332 | if (nrblocks >= 8*1024*1024/mpd->inode->i_sb->s_blocksize) |
2333 | goto flush_it; | 2333 | goto flush_it; |
@@ -3948,7 +3948,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb, | |||
3948 | return -ENOMEM; | 3948 | return -ENOMEM; |
3949 | /* | 3949 | /* |
3950 | * we save the io structure for current async | 3950 | * we save the io structure for current async |
3951 | * direct IO, so that later ext4_get_blocks() | 3951 | * direct IO, so that later ext4_map_blocks() |
3952 | * could flag the io structure whether there | 3952 | * could flag the io structure whether there |
3953 | * is a unwritten extents needs to be converted | 3953 | * is a unwritten extents needs to be converted |
3954 | * when IO is completed. | 3954 | * when IO is completed. |
@@ -5675,7 +5675,7 @@ int ext4_writepage_trans_blocks(struct inode *inode) | |||
5675 | * Calculate the journal credits for a chunk of data modification. | 5675 | * Calculate the journal credits for a chunk of data modification. |
5676 | * | 5676 | * |
5677 | * This is called from DIO, fallocate or whoever calling | 5677 | * This is called from DIO, fallocate or whoever calling |
5678 | * ext4_get_blocks() to map/allocate a chunk of contiguous disk blocks. | 5678 | * ext4_map_blocks() to map/allocate a chunk of contiguous disk blocks. |
5679 | * | 5679 | * |
5680 | * journal buffers for data blocks are not included here, as DIO | 5680 | * journal buffers for data blocks are not included here, as DIO |
5681 | * and fallocate do no need to journal data buffers. | 5681 | * and fallocate do no need to journal data buffers. |