[PATCH 11/22] hpfs: drop vmtruncate
DORMANTno replies
From: Marco Stornelli <hidden>
Date: 2012-10-06 08:36:02
Also in:
lkml
Subsystem:
filesystems (vfs and infrastructure), hpfs filesystem, the rest · Maintainers:
Alexander Viro, Christian Brauner, Mikulas Patocka, Linus Torvalds
Removed vmtruncate. Signed-off-by: Marco Stornelli <redacted> --- fs/hpfs/file.c | 8 +++++--- fs/hpfs/inode.c | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index 89d2a58..895871a 100644
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c@@ -117,8 +117,11 @@ static int hpfs_write_begin(struct file *file, struct address_space *mapping, &hpfs_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); + hpfs_truncate(mapping->host); + } } return ret;
@@ -166,6 +169,5 @@ const struct file_operations hpfs_file_ops = const struct inode_operations hpfs_file_iops = { - .truncate = hpfs_truncate, .setattr = hpfs_setattr, };
diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index 804a9a8..5dc06c8 100644
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c@@ -277,9 +277,12 @@ int hpfs_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) goto out_unlock; + + truncate_setsize(inode, attr->ia_size); + hpfs_truncate(inode); } setattr_copy(inode, attr);
--
1.7.3.4