Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262108
b: refs/heads/master
c: c6a0371
h: refs/heads/master
v: v3
  • Loading branch information
Allison Henderson authored and Theodore Ts'o committed Jul 18, 2011
1 parent 85a71d7 commit 6b5a952
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f7d0d3797fac6cad24ad9f86dd9baf65c586b434
refs/heads/master: c6a0371cbefade85376bbc326d18451860632dce
7 changes: 3 additions & 4 deletions trunk/fs/ext4/extents.c
Original file line number Diff line number Diff line change
Expand Up @@ -2500,8 +2500,7 @@ ext4_ext_more_to_rm(struct ext4_ext_path *path)
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;
int depth = ext_depth(inode);
Expand Down Expand Up @@ -2541,7 +2540,7 @@ static int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,
if (i == depth) {
/* this is leaf block */
err = ext4_ext_rm_leaf(handle, inode, path,
start, end);
start, EXT_MAX_BLOCKS - 1);
/* root level has p_bh == NULL, brelse() eats this */
brelse(path[i].p_bh);
path[i].p_bh = NULL;
Expand Down Expand Up @@ -3683,7 +3682,7 @@ void ext4_ext_truncate(struct inode *inode)

last_block = (inode->i_size + sb->s_blocksize - 1)
>> 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
* transaction synchronous.
Expand Down

0 comments on commit 6b5a952

Please sign in to comment.