From c9bad98d430f095b4f93659dd9db87082b261440 Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Sun, 27 Feb 2011 23:32:12 -0500 Subject: [PATCH] --- yaml --- r: 242379 b: refs/heads/master c: 8e8eaabefee3ff645b9551ee32c6c54c7d80ad19 h: refs/heads/master i: 242377: d0a00c08009d01ff610cc1268cbe849e2cb53400 242375: a0fc49178c1b12db7962968c2f68685993f8ac49 v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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);