---

yaml
---
r: 188687
b: refs/heads/master
c: 0f26c4b
h: refs/heads/master
i:
  188685: db2151e
  188683: a60e6f5
  188679: 22a61f7
  188671: 29c5afa
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac8839d7b264d0fa478fca7c4f9b6bb833540a80
+refs/heads/master: 0f26c4b21b684825a6dd41f2bc04d48ff62d72f8

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;