On Sat, Oct 20, 2012 at 02:19:00PM +0200, Marco Stornelli wrote: > Removed vmtruncate > > Signed-off-by: Marco Stornelli <[email protected]>
Acked-by: Joel Becker <[email protected]> Do you want me to pull this, or are you going to send it with your set? Joel > --- > 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 -- "Can any of you seriously say the Bill of Rights could get through Congress today? It wouldn't even get out of committee." - F. Lee Bailey http://www.jlbec.org/ [email protected] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
