From 26bdcadf791cc82d13fccb200aef68fb8a98b389 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Fri, 29 Jan 2010 11:01:11 -0800
Subject: [PATCH] --- yaml --- r: 188687 b: refs/heads/master c:
 0f26c4b21b684825a6dd41f2bc04d48ff62d72f8 h: refs/heads/master i:   188685:
 db2151e08912688f5c5002e4a00e1d3cb0a136f1   188683:
 a60e6f52cea3c133d31da485dfa0ca9b9b8ca1c7   188679:
 22a61f7cdeb281a4016ac6594cf798c4209b4247   188671:
 29c5afa9813f13b8c5f4b4c8f6f96ac2b2556705 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ceph/inode.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 44140250c21f..069d8ceea059 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac8839d7b264d0fa478fca7c4f9b6bb833540a80
+refs/heads/master: 0f26c4b21b684825a6dd41f2bc04d48ff62d72f8
diff --git a/trunk/fs/ceph/inode.c b/trunk/fs/ceph/inode.c
index 71e107fb4dbc..a4f573ab232e 100644
--- a/trunk/fs/ceph/inode.c
+++ b/trunk/fs/ceph/inode.c
@@ -1396,7 +1396,6 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
 	int release = 0, dirtied = 0;
 	int mask = 0;
 	int err = 0;
-	int queue_trunc = 0;
 
 	if (ceph_snap(inode) != CEPH_NOSNAP)
 		return -EROFS;
@@ -1510,11 +1509,6 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
 		if ((issued & CEPH_CAP_FILE_EXCL) &&
 		    attr->ia_size > inode->i_size) {
 			inode->i_size = attr->ia_size;
-			if (attr->ia_size < inode->i_size) {
-				ci->i_truncate_size = attr->ia_size;
-				ci->i_truncate_pending++;
-				queue_trunc = 1;
-			}
 			inode->i_blocks =
 				(attr->ia_size + (1 << 9) - 1) >> 9;
 			inode->i_ctime = attr->ia_ctime;
@@ -1567,9 +1561,6 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
 	release &= issued;
 	spin_unlock(&inode->i_lock);
 
-	if (queue_trunc)
-		__ceph_do_pending_vmtruncate(inode);
-
 	if (mask) {
 		req->r_inode = igrab(inode);
 		req->r_inode_drop = release;