diff options
author | Marco Stornelli <marco.stornelli@gmail.com> | 2012-12-15 05:47:31 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-20 14:00:01 -0500 |
commit | cfac4b47c664e207740880d6492938761c53d74b (patch) | |
tree | 282d6c3c7abbcf73a9160fbcca9ffa10c6b30c71 /fs/reiserfs/inode.c | |
parent | fa4d62ae17c7415f1ea824076870b7ad9b51fd06 (diff) |
reiserfs: drop vmtruncate
Removed vmtruncate
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/reiserfs/inode.c')
-rw-r--r-- | fs/reiserfs/inode.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index d83736fbc26c..95d7680ead47 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
@@ -3085,8 +3085,10 @@ static ssize_t reiserfs_direct_IO(int rw, struct kiocb *iocb, | |||
3085 | loff_t isize = i_size_read(inode); | 3085 | loff_t isize = i_size_read(inode); |
3086 | loff_t end = offset + iov_length(iov, nr_segs); | 3086 | loff_t end = offset + iov_length(iov, nr_segs); |
3087 | 3087 | ||
3088 | if (end > isize) | 3088 | if ((end > isize) && inode_newsize_ok(inode, isize) == 0) { |
3089 | vmtruncate(inode, isize); | 3089 | truncate_setsize(inode, isize); |
3090 | reiserfs_vfs_truncate_file(inode); | ||
3091 | } | ||
3090 | } | 3092 | } |
3091 | 3093 | ||
3092 | return ret; | 3094 | return ret; |
@@ -3200,8 +3202,13 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) | |||
3200 | */ | 3202 | */ |
3201 | reiserfs_write_unlock_once(inode->i_sb, depth); | 3203 | reiserfs_write_unlock_once(inode->i_sb, depth); |
3202 | if ((attr->ia_valid & ATTR_SIZE) && | 3204 | if ((attr->ia_valid & ATTR_SIZE) && |
3203 | attr->ia_size != i_size_read(inode)) | 3205 | attr->ia_size != i_size_read(inode)) { |
3204 | error = vmtruncate(inode, attr->ia_size); | 3206 | error = inode_newsize_ok(inode, attr->ia_size); |
3207 | if (!error) { | ||
3208 | truncate_setsize(inode, attr->ia_size); | ||
3209 | reiserfs_vfs_truncate_file(inode); | ||
3210 | } | ||
3211 | } | ||
3205 | 3212 | ||
3206 | if (!error) { | 3213 | if (!error) { |
3207 | setattr_copy(inode, attr); | 3214 | setattr_copy(inode, attr); |