From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marco Stornelli Subject: [PATCH 04/22] procfs: drop vmtruncate Date: Sat, 06 Oct 2012 10:13:42 +0200 Message-ID: <506FE836.3040400@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Anton Blanchard , Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, Linux FS Devel To: Al Viro Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Removed vmtruncate. Signed-off-by: Marco Stornelli --- fs/proc/base.c | 3 ++- fs/proc/generic.c | 3 ++- fs/proc/proc_sysctl.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index d295af9..add0944 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -544,9 +544,10 @@ int proc_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); } setattr_copy(inode, attr); diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 0d80cef..6e7a8a7 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -263,9 +263,10 @@ static int proc_notify_change(struct dentry *dentry, struct iattr *iattr) if ((iattr->ia_valid & ATTR_SIZE) && iattr->ia_size != i_size_read(inode)) { - error = vmtruncate(inode, iattr->ia_size); + error = inode_newsize_ok(inode, iattr->ia_size); if (error) return error; + truncate_setsize(inode, iattr->ia_size); } setattr_copy(inode, iattr); diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index dcd56f8..69d495c 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -738,9 +738,10 @@ static int proc_sys_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); } setattr_copy(inode, attr); -- 1.7.3.4