|
@@ -2500,8 +2500,7 @@ ext4_ext_more_to_rm(struct ext4_ext_path *path)
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
|
|
-static int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,
|
|
|
|
- ext4_lblk_t end)
|
|
|
|
|
|
+static int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start)
|
|
{
|
|
{
|
|
struct super_block *sb = inode->i_sb;
|
|
struct super_block *sb = inode->i_sb;
|
|
int depth = ext_depth(inode);
|
|
int depth = ext_depth(inode);
|
|
@@ -2541,7 +2540,7 @@ again:
|
|
if (i == depth) {
|
|
if (i == depth) {
|
|
/* this is leaf block */
|
|
/* this is leaf block */
|
|
err = ext4_ext_rm_leaf(handle, inode, path,
|
|
err = ext4_ext_rm_leaf(handle, inode, path,
|
|
- start, end);
|
|
|
|
|
|
+ start, EXT_MAX_BLOCKS - 1);
|
|
/* root level has p_bh == NULL, brelse() eats this */
|
|
/* root level has p_bh == NULL, brelse() eats this */
|
|
brelse(path[i].p_bh);
|
|
brelse(path[i].p_bh);
|
|
path[i].p_bh = NULL;
|
|
path[i].p_bh = NULL;
|
|
@@ -3683,7 +3682,7 @@ void ext4_ext_truncate(struct inode *inode)
|
|
|
|
|
|
last_block = (inode->i_size + sb->s_blocksize - 1)
|
|
last_block = (inode->i_size + sb->s_blocksize - 1)
|
|
>> EXT4_BLOCK_SIZE_BITS(sb);
|
|
>> EXT4_BLOCK_SIZE_BITS(sb);
|
|
- err = ext4_ext_remove_space(inode, last_block, EXT_MAX_BLOCKS - 1);
|
|
|
|
|
|
+ err = ext4_ext_remove_space(inode, last_block);
|
|
|
|
|
|
/* In a multi-transaction truncate, we only make the final
|
|
/* In a multi-transaction truncate, we only make the final
|
|
* transaction synchronous.
|
|
* transaction synchronous.
|