hfs: drop vmtruncate
Subsystems (2)
PATCH 10/22 hfs: drop vmtruncate
Removed vmtruncate.
Signed-off-by Marco Stornelli <[email protected]>
--- fs/hfs/inode.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-)
fs/hfs/inode.c +13 -6
@@ -47,8 +47,11 @@ static int hfs_write_begin(struct file *file, struct address_space *mapping, &HFS_I(mapping->host)->phys_size);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); +hfs_file_truncate (mapping->host); + } }return ret;
@@ -134,8 +137,10 @@ static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb,loff_t isize =i_size_read (inode);loff_t end = offset +iov_length (iov, nr_segs); -if (end > isize) -vmtruncate (inode, isize); +if ((end > isize) &&inode_newsize_ok (inode, isize) ==0 ) { +truncate_setsize (inode, isize); +hfs_file_truncate (inode); + } }return ret;
@@ -617,9 +622,12 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr) attr->ia_size != i_size_read(inode)) {inode_dio_wait (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); +hfs_file_truncate (inode); }setattr_copy (inode, attr);
@@ -668,7 +676,6 @@ static const struct file_operations hfs_file_operations = {static const struct inode_operations hfs_file_inode_operations = { .lookup = hfs_file_lookup, - .truncate = hfs_file_truncate, .setattr = hfs_inode_setattr, .setxattr = hfs_setxattr, .getxattr = hfs_getxattr,
Signature · 1 line
1.7.3.4