From b23fc9ccf14be4940ee6ec9f60700dfe728fa623 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 9 Nov 2010 14:09:53 +0000
Subject: [PATCH] --- yaml --- r: 223778 b: refs/heads/master c:
 9e55cd53728719ac3a3234a6618259ab8e203a10 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/gfs2/inode.c     | 9 ---------
 trunk/fs/gfs2/ops_inode.c | 9 ---------
 trunk/fs/gfs2/xattr.c     | 9 ---------
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 8f45028c3263..43f106769741 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc18152eb7c27653199546bd14e991a451ab8d1b
+refs/heads/master: 9e55cd53728719ac3a3234a6618259ab8e203a10
diff --git a/trunk/fs/gfs2/inode.c b/trunk/fs/gfs2/inode.c
index e1213f7f9217..14e682dbe8bf 100644
--- a/trunk/fs/gfs2/inode.c
+++ b/trunk/fs/gfs2/inode.c
@@ -916,17 +916,8 @@ static int __gfs2_setattr_simple(struct gfs2_inode *ip, 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);
-
-	gfs2_assert_warn(GFS2_SB(inode), !error);
 	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
 	gfs2_dinode_out(ip, dibh->b_data);
 	brelse(dibh);
diff --git a/trunk/fs/gfs2/ops_inode.c b/trunk/fs/gfs2/ops_inode.c
index 12cbea7502c2..457ecd155187 100644
--- a/trunk/fs/gfs2/ops_inode.c
+++ b/trunk/fs/gfs2/ops_inode.c
@@ -1104,17 +1104,8 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
 	if (error)
 		goto out_end_trans;
 
-	if ((attr->ia_valid & ATTR_SIZE) &&
-	    attr->ia_size != i_size_read(inode)) {
-		int error;
-
-		error = vmtruncate(inode, attr->ia_size);
-		gfs2_assert_warn(sdp, !error);
-	}
-
 	setattr_copy(inode, attr);
 	mark_inode_dirty(inode);
-
 	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
 	gfs2_dinode_out(ip, dibh->b_data);
 	brelse(dibh);
diff --git a/trunk/fs/gfs2/xattr.c b/trunk/fs/gfs2/xattr.c
index 30b58f07c8a6..ecfd40dd28ad 100644
--- a/trunk/fs/gfs2/xattr.c
+++ b/trunk/fs/gfs2/xattr.c
@@ -1325,17 +1325,8 @@ int gfs2_xattr_acl_chmod(struct gfs2_inode *ip, struct iattr *attr, char *data)
 	if (error)
 		goto out_trans_end;
 
-	if ((attr->ia_valid & ATTR_SIZE) &&
-	    attr->ia_size != i_size_read(inode)) {
-		int error;
-
-		error = vmtruncate(inode, attr->ia_size);
-		gfs2_assert_warn(GFS2_SB(inode), !error);
-	}
-
 	setattr_copy(inode, attr);
 	mark_inode_dirty(inode);
-
 	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
 	gfs2_dinode_out(ip, dibh->b_data);
 	brelse(dibh);