diff options
| author | Mark Fasheh <mark.fasheh@oracle.com> | 2007-08-31 10:23:41 -0700 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2007-09-11 11:39:46 -0700 |
| commit | e535e2efd295c3990bb9f654c8bb6bd176ebdc2b (patch) | |
| tree | 5f519f1003a7f5700e5e8d62d477382bc806d738 /fs | |
| parent | 30b8548f2c270c0205558fe4826a6ab8e7fe51ad (diff) | |
| download | talos-obmc-linux-e535e2efd295c3990bb9f654c8bb6bd176ebdc2b.tar.gz talos-obmc-linux-e535e2efd295c3990bb9f654c8bb6bd176ebdc2b.zip | |
ocfs2: Fix calculation of i_blocks during truncate
We were setting i_blocks too early - before truncating any allocation.
Correct things to set i_blocks after the allocation change.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/alloc.c | 1 | ||||
| -rw-r--r-- | fs/ocfs2/file.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 4f517665c9a0..778a850b4634 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -5602,6 +5602,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb, clusters_to_del; spin_unlock(&OCFS2_I(inode)->ip_lock); le32_add_cpu(&fe->i_clusters, -clusters_to_del); + inode->i_blocks = ocfs2_inode_sector_count(inode); status = ocfs2_trim_tree(inode, path, handle, tc, clusters_to_del, &delete_blk); diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 4ffa715be09c..7e34e66159c6 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -314,7 +314,6 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, } i_size_write(inode, new_i_size); - inode->i_blocks = ocfs2_align_bytes_to_sectors(new_i_size); inode->i_ctime = inode->i_mtime = CURRENT_TIME; di = (struct ocfs2_dinode *) fe_bh->b_data; |
