[PATCH 05/22] omfs: drop vmtruncate

From: Marco Stornelli
Date: Sat Oct 06 2012 - 04:23:48 EST


Removed vmtruncate.

Signed-off-by: Marco Stornelli <marco.stornelli@xxxxxxxxx>
---
fs/omfs/file.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index 77e3cb2..c10ab90 100644
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -316,8 +316,11 @@ static int omfs_write_begin(struct file *file, struct address_space *mapping,
omfs_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);
+ omfs_truncate(mapping->host);
+ }
}

return ret;
@@ -350,9 +353,11 @@ static int omfs_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);
+ omfs_truncate(inode);
}

setattr_copy(inode, attr);
@@ -362,7 +367,6 @@ static int omfs_setattr(struct dentry *dentry, struct iattr *attr)

const struct inode_operations omfs_file_inops = {
.setattr = omfs_setattr,
- .truncate = omfs_truncate
};

const struct address_space_operations omfs_aops = {
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/