summaryrefslogtreecommitdiffstats
path: root/fs/ufs/inode.c
diff options
context:
space:
mode:
authorAl Viro2015-06-17 00:04:16 +0200
committerAl Viro2015-07-06 23:39:20 +0200
commitd622f167b8435c856376edec130053fb56bf83e4 (patch)
tree908a106d1ac997dd145f8027d47a4fc9b6a6f04f /fs/ufs/inode.c
parentufs: kill more lock_ufs() calls (diff)
downloadkernel-qcow2-linux-d622f167b8435c856376edec130053fb56bf83e4.tar.gz
kernel-qcow2-linux-d622f167b8435c856376edec130053fb56bf83e4.tar.xz
kernel-qcow2-linux-d622f167b8435c856376edec130053fb56bf83e4.zip
ufs: switch ufs_evict_inode() to trimmed-down variant of ufs_truncate()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ufs/inode.c')
-rw-r--r--fs/ufs/inode.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 0e4d88e0e709..282b0ced6272 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -884,14 +884,9 @@ void ufs_evict_inode(struct inode * inode)
truncate_inode_pages_final(&inode->i_data);
if (want_delete) {
- loff_t old_i_size;
- /*UFS_I(inode)->i_dtime = CURRENT_TIME;*/
- mark_inode_dirty(inode);
- ufs_update_inode(inode, IS_SYNC(inode));
- old_i_size = inode->i_size;
inode->i_size = 0;
- if (inode->i_blocks && ufs_truncate(inode, old_i_size))
- ufs_warning(inode->i_sb, __func__, "ufs_truncate failed\n");
+ if (inode->i_blocks)
+ ufs_truncate_blocks(inode);
}
invalidate_inode_buffers(inode);