nilfs2: drop vmtruncate
Subsystems (2)
PATCH 18/21 nilfs2: drop vmtruncate
Removed vmtruncate.
Signed-off-by Marco Stornelli <[email protected]>
--- fs/nilfs2/file.c | 1 - fs/nilfs2/inode.c | 18 +++++++++++++----- fs/nilfs2/recovery.c | 7 +++++-- 3 files changed, 18 insertions(+), 8 deletions(-)
fs/nilfs2/file.c +0 -1
@@ -166,7 +166,6 @@ const struct file_operations nilfs_file_operations = { };const struct inode_operations nilfs_file_inode_operations = { - .truncate = nilfs_truncate, .setattr = nilfs_setattr, .permission = nilfs_permission, .fiemap = nilfs_fiemap,
fs/nilfs2/inode.c +13 -5
@@ -228,8 +228,11 @@ static int nilfs_write_begin(struct file *file, struct address_space *mapping, nilfs_get_block);if (unlikely (err)) {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); +nilfs_truncate (mapping->host); + }nilfs_transaction_abort (inode->i_sb); }
@@ -277,8 +280,10 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,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); +nilfs_truncate (inode); + } }return size;
@@ -787,9 +792,12 @@ int nilfs_setattr(struct dentry *dentry, struct iattr *iattr) iattr->ia_size != i_size_read(inode)) {inode_dio_wait (inode); - err =vmtruncate (inode, iattr->ia_size); + err =inode_newsize_ok (inode, iattr->ia_size);if (unlikely (err)) goto out_err; + +truncate_setsize (inode, iattr->ia_size); +nilfs_truncate (inode); }setattr_copy (inode, iattr);
fs/nilfs2/recovery.c +5 -2
@@ -526,8 +526,11 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs, 0, &page, nilfs_get_block);if (unlikely (err)) {loff_t isize = inode->i_size; -if (pos + blocksize > isize) -vmtruncate (inode, isize); +if ((pos + blocksize > isize) && +inode_newsize_ok (inode, isize) ==0 ) { +truncate_setsize (inode, isize); +nilfs_truncate (inode); + } goto failed_inode; }
Signature · 5 lines
1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html