diff --git a/[refs] b/[refs] index 5a2ef7138f63..36d7f74bbb34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32a9bb57d7c1fd04ae0f72b8f671501f000a0e9f +refs/heads/master: 8e8eaabefee3ff645b9551ee32c6c54c7d80ad19 diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index dcc2287433b6..67e7a3caf9ed 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -173,7 +173,7 @@ int ext4_truncate_restart_trans(handle_t *handle, struct inode *inode, BUG_ON(EXT4_JOURNAL(inode) == NULL); jbd_debug(2, "restarting handle %p\n", handle); up_write(&EXT4_I(inode)->i_data_sem); - ret = ext4_journal_restart(handle, blocks_for_truncate(inode)); + ret = ext4_journal_restart(handle, nblocks); down_write(&EXT4_I(inode)->i_data_sem); ext4_discard_preallocations(inode);