Messages in this thread Patch in this message | | | Date | Sat, 20 Oct 2012 14:19:00 +0200 | From | Marco Stornelli <> | Subject | [PATCH 06/21] ocfs2: drop vmtruncate |
| |
Removed vmtruncate
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com> --- fs/ocfs2/file.c | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 5a4ee77..eb16e44 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1172,6 +1172,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) status = -ENOSPC; goto bail_unlock; } + truncate_setsize(inode, attr->ia_size); } if ((attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || @@ -1218,24 +1219,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); -- 1.7.3.4
| |