affs: drop vmtruncate
Subsystems (2)
PATCH 8/22 affs: drop vmtruncate
Removed vmtruncate.
Signed-off-by Marco Stornelli <[email protected]>
--- fs/affs/file.c | 8 +++++--- fs/affs/inode.c | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-)
fs/affs/file.c +5 -3
@@ -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;
fs/affs/inode.c +4 -1
@@ -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);
Signature · 1 line
1.7.3.4