From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932404Ab2JTMYM (ORCPT ); Sat, 20 Oct 2012 08:24:12 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:48490 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752411Ab2JTMYL (ORCPT ); Sat, 20 Oct 2012 08:24:11 -0400 Message-ID: <5082965D.3070307@gmail.com> Date: Sat, 20 Oct 2012 14:17:33 +0200 From: Marco Stornelli User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120825 Thunderbird/15.0 MIME-Version: 1.0 To: Linux FS Devel CC: linux-kernel@vger.kernel.org Subject: [PATCH 04/21] procfs: drop vmtruncate Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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 144a967..f976f31 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 a781bdf..f8d7989 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -737,9 +737,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