diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 20:23:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 20:23:16 -0400 |
| commit | 577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d (patch) | |
| tree | 8b3d6902494dcf3d872ce7e47ebe38846f0d8895 /fs/ocfs2/file.c | |
| parent | 7111de76438e05ceab8ba2a471192fa3ea6c3572 (diff) | |
| parent | e535e2efd295c3990bb9f654c8bb6bd176ebdc2b (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Fix calculation of i_blocks during truncate
[PATCH] ocfs2: Fix a wrong cluster calculation.
[PATCH] ocfs2: fix mount option parsing
ocfs2: update docs for new features
Diffstat (limited to 'fs/ocfs2/file.c')
| -rw-r--r-- | fs/ocfs2/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
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, | |||
| 314 | } | 314 | } |
| 315 | 315 | ||
| 316 | i_size_write(inode, new_i_size); | 316 | i_size_write(inode, new_i_size); |
| 317 | inode->i_blocks = ocfs2_align_bytes_to_sectors(new_i_size); | ||
| 318 | inode->i_ctime = inode->i_mtime = CURRENT_TIME; | 317 | inode->i_ctime = inode->i_mtime = CURRENT_TIME; |
| 319 | 318 | ||
| 320 | di = (struct ocfs2_dinode *) fe_bh->b_data; | 319 | di = (struct ocfs2_dinode *) fe_bh->b_data; |