Skip to content

Commit

Permalink
ceph: remove unreachable code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yehuda Sadeh authored and Sage Weil committed Jan 29, 2010
1 parent ac8839d commit 0f26c4b
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions fs/ceph/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 0f26c4b

Please sign in to comment.