From 1ee979300064345adf89191c71fc9ba7403915a2 Mon Sep 17 00:00:00 2001 From: Marco Stornelli Date: Sat, 15 Dec 2012 11:50:20 +0100 Subject: [PATCH] --- yaml --- r: 347797 b: refs/heads/master c: a6ff03771e9d4a2a64cd1414e32c6b369ae935ba h: refs/heads/master i: 347795: a145cfff5f4cc939847c93823b7907722a57ba8b v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/file.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 80e4c4824d63..7b52580263c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8f5293aac161f9dfd70d0c03c3e407d417fafe1 +refs/heads/master: a6ff03771e9d4a2a64cd1414e32c6b369ae935ba diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c index fe492e1a3cfc..37d313ede159 100644 --- a/trunk/fs/ocfs2/file.c +++ b/trunk/fs/ocfs2/file.c @@ -1218,24 +1218,6 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) } } - /* - * This will intentionally not wind up calling truncate_setsize(), - * since all the work for a size change has been done above. - * Otherwise, we could get into problems with truncate as - * ip_alloc_sem is used there to protect against i_size - * changes. - * - * XXX: this means the conditional below can probably be removed. - */ - if ((attr->ia_valid & ATTR_SIZE) && - attr->ia_size != i_size_read(inode)) { - status = vmtruncate(inode, attr->ia_size); - if (status) { - mlog_errno(status); - goto bail_commit; - } - } - setattr_copy(inode, attr); mark_inode_dirty(inode);