diff options
author | Theodore Ts'o <tytso@mit.edu> | 2009-05-12 00:25:28 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2009-05-12 00:25:28 -0400 |
commit | e4d996ca806e93dddb5d76c0d3d859b494c559f6 (patch) | |
tree | dee33d8bb77bcd5ef5bebeab04d7fe95e3cb4dc5 /fs/ext4/inode.c | |
parent | f888e652d758bfe0c04c209b72a05972daeba386 (diff) |
ext4: Rename ext4_get_blocks_handle() to be ext4_ind_get_blocks()
The static function ext4_get_blocks_handle() is badly named. Of
*course* it takes a handle. Since its counterpart for extent-based
file is ext4_ext_get_blocks(), rename it to be ext4_ind_get_blocks().
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 476d843610ac..f758e8021d1a 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -914,7 +914,7 @@ err_out: | |||
914 | * down_read(&EXT4_I(inode)->i_data_sem) if not allocating file system block | 914 | * down_read(&EXT4_I(inode)->i_data_sem) if not allocating file system block |
915 | * (ie, create is zero). Otherwise down_write(&EXT4_I(inode)->i_data_sem) | 915 | * (ie, create is zero). Otherwise down_write(&EXT4_I(inode)->i_data_sem) |
916 | */ | 916 | */ |
917 | static int ext4_get_blocks_handle(handle_t *handle, struct inode *inode, | 917 | static int ext4_ind_get_blocks(handle_t *handle, struct inode *inode, |
918 | ext4_lblk_t iblock, unsigned int maxblocks, | 918 | ext4_lblk_t iblock, unsigned int maxblocks, |
919 | struct buffer_head *bh_result, | 919 | struct buffer_head *bh_result, |
920 | int create, int extend_disksize) | 920 | int create, int extend_disksize) |
@@ -1129,7 +1129,7 @@ static void ext4_da_update_reserve_space(struct inode *inode, int used) | |||
1129 | * mapped. | 1129 | * mapped. |
1130 | * | 1130 | * |
1131 | * If file type is extents based, it will call ext4_ext_get_blocks(), | 1131 | * If file type is extents based, it will call ext4_ext_get_blocks(), |
1132 | * Otherwise, call with ext4_get_blocks_handle() to handle indirect mapping | 1132 | * Otherwise, call with ext4_ind_get_blocks() to handle indirect mapping |
1133 | * based files | 1133 | * based files |
1134 | * | 1134 | * |
1135 | * On success, it returns the number of blocks being mapped or allocate. | 1135 | * On success, it returns the number of blocks being mapped or allocate. |
@@ -1160,8 +1160,8 @@ int ext4_get_blocks_wrap(handle_t *handle, struct inode *inode, sector_t block, | |||
1160 | retval = ext4_ext_get_blocks(handle, inode, block, max_blocks, | 1160 | retval = ext4_ext_get_blocks(handle, inode, block, max_blocks, |
1161 | bh, 0, 0); | 1161 | bh, 0, 0); |
1162 | } else { | 1162 | } else { |
1163 | retval = ext4_get_blocks_handle(handle, | 1163 | retval = ext4_ind_get_blocks(handle, inode, block, max_blocks, |
1164 | inode, block, max_blocks, bh, 0, 0); | 1164 | bh, 0, 0); |
1165 | } | 1165 | } |
1166 | up_read((&EXT4_I(inode)->i_data_sem)); | 1166 | up_read((&EXT4_I(inode)->i_data_sem)); |
1167 | 1167 | ||
@@ -1215,7 +1215,7 @@ int ext4_get_blocks_wrap(handle_t *handle, struct inode *inode, sector_t block, | |||
1215 | retval = ext4_ext_get_blocks(handle, inode, block, max_blocks, | 1215 | retval = ext4_ext_get_blocks(handle, inode, block, max_blocks, |
1216 | bh, create, extend_disksize); | 1216 | bh, create, extend_disksize); |
1217 | } else { | 1217 | } else { |
1218 | retval = ext4_get_blocks_handle(handle, inode, block, | 1218 | retval = ext4_ind_get_blocks(handle, inode, block, |
1219 | max_blocks, bh, create, extend_disksize); | 1219 | max_blocks, bh, create, extend_disksize); |
1220 | 1220 | ||
1221 | if (retval > 0 && buffer_new(bh)) { | 1221 | if (retval > 0 && buffer_new(bh)) { |
@@ -1297,7 +1297,7 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode, | |||
1297 | err = ext4_get_blocks_wrap(handle, inode, block, 1, | 1297 | err = ext4_get_blocks_wrap(handle, inode, block, 1, |
1298 | &dummy, create, 1, 0); | 1298 | &dummy, create, 1, 0); |
1299 | /* | 1299 | /* |
1300 | * ext4_get_blocks_handle() returns number of blocks | 1300 | * ext4_get_blocks_wrap() returns number of blocks |
1301 | * mapped. 0 in case of a HOLE. | 1301 | * mapped. 0 in case of a HOLE. |
1302 | */ | 1302 | */ |
1303 | if (err > 0) { | 1303 | if (err > 0) { |