From a145cfff5f4cc939847c93823b7907722a57ba8b Mon Sep 17 00:00:00 2001
From: Marco Stornelli <marco.stornelli@gmail.com>
Date: Sat, 15 Dec 2012 11:48:48 +0100
Subject: [PATCH] --- yaml --- r: 347795 b: refs/heads/master c:
 46f69557103e11fb963ae5c98b7777e90493241b h: refs/heads/master i:   347793:
 10585eb291e164548ce141c91bf6f01eabab3c59   347791:
 9234429ef4d1b7af39d6cbac6bab86cf3d80e5c1 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/proc/base.c        | 7 -------
 trunk/fs/proc/generic.c     | 9 +--------
 trunk/fs/proc/proc_sysctl.c | 7 -------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 2e465bffffb5..2122023d074f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfac4b47c664e207740880d6492938761c53d74b
+refs/heads/master: 46f69557103e11fb963ae5c98b7777e90493241b
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index 5a5a0be40e40..9b43ff77a51e 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -542,13 +542,6 @@ int proc_setattr(struct dentry *dentry, struct iattr *attr)
 	if (error)
 		return error;
 
-	if ((attr->ia_valid & ATTR_SIZE) &&
-	    attr->ia_size != i_size_read(inode)) {
-		error = vmtruncate(inode, attr->ia_size);
-		if (error)
-			return error;
-	}
-
 	setattr_copy(inode, attr);
 	mark_inode_dirty(inode);
 	return 0;
diff --git a/trunk/fs/proc/generic.c b/trunk/fs/proc/generic.c
index 7b3ae3cc0ef9..2e4ed13b9eed 100644
--- a/trunk/fs/proc/generic.c
+++ b/trunk/fs/proc/generic.c
@@ -261,16 +261,9 @@ static int proc_notify_change(struct dentry *dentry, struct iattr *iattr)
 	if (error)
 		return error;
 
-	if ((iattr->ia_valid & ATTR_SIZE) &&
-	    iattr->ia_size != i_size_read(inode)) {
-		error = vmtruncate(inode, iattr->ia_size);
-		if (error)
-			return error;
-	}
-
 	setattr_copy(inode, iattr);
 	mark_inode_dirty(inode);
-	
+
 	de->uid = inode->i_uid;
 	de->gid = inode->i_gid;
 	de->mode = inode->i_mode;
diff --git a/trunk/fs/proc/proc_sysctl.c b/trunk/fs/proc/proc_sysctl.c
index 701580ddfcc3..1827d88ad58b 100644
--- a/trunk/fs/proc/proc_sysctl.c
+++ b/trunk/fs/proc/proc_sysctl.c
@@ -736,13 +736,6 @@ static int proc_sys_setattr(struct dentry *dentry, struct iattr *attr)
 	if (error)
 		return error;
 
-	if ((attr->ia_valid & ATTR_SIZE) &&
-	    attr->ia_size != i_size_read(inode)) {
-		error = vmtruncate(inode, attr->ia_size);
-		if (error)
-			return error;
-	}
-
 	setattr_copy(inode, attr);
 	mark_inode_dirty(inode);
 	return 0;