diff options
| -rw-r--r-- | fs/ext2/inode.c | 7 | ||||
| -rw-r--r-- | fs/ext3/inode.c | 8 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 9 |
3 files changed, 8 insertions, 16 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 7a1fcc9fde92..03978ec2a91c 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
| @@ -286,15 +286,12 @@ static unsigned long ext2_find_near(struct inode *inode, Indirect *ind) | |||
| 286 | * ext2_find_goal - find a prefered place for allocation. | 286 | * ext2_find_goal - find a prefered place for allocation. |
| 287 | * @inode: owner | 287 | * @inode: owner |
| 288 | * @block: block we want | 288 | * @block: block we want |
| 289 | * @chain: chain of indirect blocks | ||
| 290 | * @partial: pointer to the last triple within a chain | 289 | * @partial: pointer to the last triple within a chain |
| 291 | * | 290 | * |
| 292 | * Returns preferred place for a block (the goal). | 291 | * Returns preferred place for a block (the goal). |
| 293 | */ | 292 | */ |
| 294 | 293 | ||
| 295 | static inline int ext2_find_goal(struct inode *inode, | 294 | static inline int ext2_find_goal(struct inode *inode, long block, |
| 296 | long block, | ||
| 297 | Indirect chain[4], | ||
| 298 | Indirect *partial) | 295 | Indirect *partial) |
| 299 | { | 296 | { |
| 300 | struct ext2_block_alloc_info *block_i; | 297 | struct ext2_block_alloc_info *block_i; |
| @@ -638,7 +635,7 @@ reread: | |||
| 638 | if (S_ISREG(inode->i_mode) && (!ei->i_block_alloc_info)) | 635 | if (S_ISREG(inode->i_mode) && (!ei->i_block_alloc_info)) |
| 639 | ext2_init_block_alloc_info(inode); | 636 | ext2_init_block_alloc_info(inode); |
| 640 | 637 | ||
| 641 | goal = ext2_find_goal(inode, iblock, chain, partial); | 638 | goal = ext2_find_goal(inode, iblock, partial); |
| 642 | 639 | ||
| 643 | /* the number of blocks need to allocate for [d,t]indirect blocks */ | 640 | /* the number of blocks need to allocate for [d,t]indirect blocks */ |
| 644 | indirect_blks = (chain + depth) - partial - 1; | 641 | indirect_blks = (chain + depth) - partial - 1; |
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 077535439288..a4f2d673d382 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c | |||
| @@ -439,16 +439,14 @@ static ext3_fsblk_t ext3_find_near(struct inode *inode, Indirect *ind) | |||
| 439 | * ext3_find_goal - find a prefered place for allocation. | 439 | * ext3_find_goal - find a prefered place for allocation. |
| 440 | * @inode: owner | 440 | * @inode: owner |
| 441 | * @block: block we want | 441 | * @block: block we want |
| 442 | * @chain: chain of indirect blocks | ||
| 443 | * @partial: pointer to the last triple within a chain | 442 | * @partial: pointer to the last triple within a chain |
| 444 | * @goal: place to store the result. | ||
| 445 | * | 443 | * |
| 446 | * Normally this function find the prefered place for block allocation, | 444 | * Normally this function find the prefered place for block allocation, |
| 447 | * stores it in *@goal and returns zero. | 445 | * returns it. |
| 448 | */ | 446 | */ |
| 449 | 447 | ||
| 450 | static ext3_fsblk_t ext3_find_goal(struct inode *inode, long block, | 448 | static ext3_fsblk_t ext3_find_goal(struct inode *inode, long block, |
| 451 | Indirect chain[4], Indirect *partial) | 449 | Indirect *partial) |
| 452 | { | 450 | { |
| 453 | struct ext3_block_alloc_info *block_i; | 451 | struct ext3_block_alloc_info *block_i; |
| 454 | 452 | ||
| @@ -884,7 +882,7 @@ int ext3_get_blocks_handle(handle_t *handle, struct inode *inode, | |||
| 884 | if (S_ISREG(inode->i_mode) && (!ei->i_block_alloc_info)) | 882 | if (S_ISREG(inode->i_mode) && (!ei->i_block_alloc_info)) |
| 885 | ext3_init_block_alloc_info(inode); | 883 | ext3_init_block_alloc_info(inode); |
| 886 | 884 | ||
| 887 | goal = ext3_find_goal(inode, iblock, chain, partial); | 885 | goal = ext3_find_goal(inode, iblock, partial); |
| 888 | 886 | ||
| 889 | /* the number of blocks need to allocate for [d,t]indirect blocks */ | 887 | /* the number of blocks need to allocate for [d,t]indirect blocks */ |
| 890 | indirect_blks = (chain + depth) - partial - 1; | 888 | indirect_blks = (chain + depth) - partial - 1; |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 05c4145dd27d..0e9055cf700e 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -429,16 +429,13 @@ static ext4_fsblk_t ext4_find_near(struct inode *inode, Indirect *ind) | |||
| 429 | * ext4_find_goal - find a prefered place for allocation. | 429 | * ext4_find_goal - find a prefered place for allocation. |
| 430 | * @inode: owner | 430 | * @inode: owner |
| 431 | * @block: block we want | 431 | * @block: block we want |
| 432 | * @chain: chain of indirect blocks | ||
| 433 | * @partial: pointer to the last triple within a chain | 432 | * @partial: pointer to the last triple within a chain |
| 434 | * @goal: place to store the result. | ||
| 435 | * | 433 | * |
| 436 | * Normally this function find the prefered place for block allocation, | 434 | * Normally this function find the prefered place for block allocation, |
| 437 | * stores it in *@goal and returns zero. | 435 | * returns it. |
| 438 | */ | 436 | */ |
| 439 | |||
| 440 | static ext4_fsblk_t ext4_find_goal(struct inode *inode, ext4_lblk_t block, | 437 | static ext4_fsblk_t ext4_find_goal(struct inode *inode, ext4_lblk_t block, |
| 441 | Indirect chain[4], Indirect *partial) | 438 | Indirect *partial) |
| 442 | { | 439 | { |
| 443 | struct ext4_block_alloc_info *block_i; | 440 | struct ext4_block_alloc_info *block_i; |
| 444 | 441 | ||
| @@ -839,7 +836,7 @@ int ext4_get_blocks_handle(handle_t *handle, struct inode *inode, | |||
| 839 | if (S_ISREG(inode->i_mode) && (!ei->i_block_alloc_info)) | 836 | if (S_ISREG(inode->i_mode) && (!ei->i_block_alloc_info)) |
| 840 | ext4_init_block_alloc_info(inode); | 837 | ext4_init_block_alloc_info(inode); |
| 841 | 838 | ||
| 842 | goal = ext4_find_goal(inode, iblock, chain, partial); | 839 | goal = ext4_find_goal(inode, iblock, partial); |
| 843 | 840 | ||
| 844 | /* the number of blocks need to allocate for [d,t]indirect blocks */ | 841 | /* the number of blocks need to allocate for [d,t]indirect blocks */ |
| 845 | indirect_blks = (chain + depth) - partial - 1; | 842 | indirect_blks = (chain + depth) - partial - 1; |
