Messages in this thread Patch in this message | | | Date | Sat, 06 Oct 2012 10:19:28 +0200 | From | Marco Stornelli <> | Subject | [PATCH 08/22] affs: drop vmtruncate |
| |
Removed vmtruncate.
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com> --- fs/affs/file.c | 8 +++++--- fs/affs/inode.c | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/fs/affs/file.c b/fs/affs/file.c index 2f4c935..34ebe09 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -39,7 +39,6 @@ const struct file_operations affs_file_operations = { }; const struct inode_operations affs_file_inode_operations = { - .truncate = affs_truncate, .setattr = affs_notify_change, }; @@ -414,8 +413,11 @@ static int affs_write_begin(struct file *file, struct address_space *mapping, &AFFS_I(mapping->host)->mmu_private); if (unlikely(ret)) { loff_t isize = mapping->host->i_size; - if (pos + len > isize) - vmtruncate(mapping->host, isize); + if ((pos + len > isize) && + inode_newsize_ok(mapping->host, isize) == 0) { + truncate_setsize(mapping->host, isize); + affs_truncate(mapping->host); + } } return ret; diff --git a/fs/affs/inode.c b/fs/affs/inode.c index 15c4842..0e092d0 100644 --- a/fs/affs/inode.c +++ b/fs/affs/inode.c @@ -237,9 +237,12 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr) if ((attr->ia_valid & ATTR_SIZE) && attr->ia_size != i_size_read(inode)) { - error = vmtruncate(inode, attr->ia_size); + error = inode_newsize_ok(inode, attr->ia_size); if (error) return error; + + truncate_setsize(inode, attr->ia_size); + affs_truncate(inode); } setattr_copy(inode, attr); -- 1.7.3.4
| |