ceph: remove unreachable code

We never truncate to a smaller size without contacting the MDS.

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 71e107fb4dbcdc9dacf5c2e248db890cb692e28f..a4f573ab232ea3004524c302c1e3488422618dbe 100644 (file)
--- a/fs/ceph/inode.c
+++ b/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;