On Wed, Jun 09, 2010 at 03:08:39AM -0700, Joel Becker wrote:
> On Wed, Jun 09, 2010 at 04:48:20PM +0800, Tao Ma wrote:
> > diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> > index 6a13ea6..06fd85c 100644
> > --- a/fs/ocfs2/file.c
> > +++ b/fs/ocfs2/file.c
> > @@ -1052,17 +1052,17 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
> > }
> >
> > /*
> > - * This will intentionally not wind up calling simple_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.
> > + * Since all the work for a size change has been done above,
> > + * we only need to call simple_setsize to update i_size.
> > */
> > - status = inode_setattr(inode, attr);
> > - if (status < 0) {
> > - mlog_errno(status);
> > - goto bail_commit;
> > + if (attr->ia_valid & ATTR_SIZE) {
> > + status = simple_setsize(inode, attr->ia_size);
> > + if (status < 0) {
> > + mlog_errno(status);
> > + goto bail_commit;
> > + }
>
> Boy, this is a bit to think about. The old code deliberately
> used vmtruncate() to update i_size and trim the pagecace, but because we
> didn't implement ->truncate() we knew that we wouldn't modify the
> (already adjusted) allocation. Not buggy, Christoph, just a roundabout
> way to get the job done.
Good to have that confirmed.
> The new simple_setsize() does nothing but update i_size and trim
> the pagecache, right Nick? If that's so, that's all we need.
Yep, check out vmtruncate:
int vmtruncate(struct inode *inode, loff_t offset)
{
int error;
error = simple_setsize(inode, offset);
if (error)
return error;
if (inode->i_op->truncate)
inode->i_op->truncate(inode);
return error;
}
Of course, simple_setsize has the inode_newsize_ok check, which you
should be calling before you even start adjusting your allocation.
So please open-code the pagecache truncation part of this, or better
yet if you push the change through Al's tree, use Christoph's new
truncate_pagecache helper.
Also, I hope you're all following the setattr/truncate discussions on
fsdevel? setattr is in a bit of a mess in a lot of fs; it will be nice
to know exactly when various inode attributes are valid to test, to
start with.
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
