From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marco Stornelli Subject: [PATCH 05/21] omfs: drop vmtruncate Date: Fri, 31 Aug 2012 15:53:43 +0200 Message-ID: <5040C1E7.4060108@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Bob Copeland , linux-karma-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org To: Linux FS Devel Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Removed vmtruncate. Signed-off-by: Marco Stornelli --- 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 2c6d952..2139ee9 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c @@ -317,8 +317,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; @@ -351,9 +354,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); @@ -363,7 +368,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