minix: drop vmtruncate
PATCH 16/22 minix: drop vmtruncate
Removed vmtruncate.
Signed-off-by Marco Stornelli <[email protected]>
--- fs/minix/file.c | 6 ++++-- fs/minix/inode.c | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-)
fs/minix/file.c +4 -2
@@ -34,9 +34,12 @@ static int minix_setattr(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); +minix_truncate (inode); }setattr_copy (inode, attr);
@@ -45,7 +48,6 @@ static int minix_setattr(struct dentry *dentry, struct iattr *attr) }const struct inode_operations minix_file_inode_operations = { - .truncate = minix_truncate, .setattr = minix_setattr, .getattr = minix_getattr, };
fs/minix/inode.c +5 -2
@@ -405,8 +405,11 @@ static int minix_write_begin(struct file *file, struct address_space *mapping, minix_get_block);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); +minix_truncate (mapping->host); + } }return ret;
Signature · 1 line
1.7.3.4