Hi All, On Wed, 11 Aug 2010 10:17:51 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Reported by me June 22 with a fixup, reminded Aug 4 and yesterday ... it > needed to be fixed up by Linus when he merged Al's tree ... I will apply this fix patch to linux-next today ... Al, Christoph, this is the fix I sent out earlier. Is it correct enough for Linus to apply it? From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Tue, 22 Jun 2010 11:15:01 +1000 Subject: [PATCH] v9fs: fixup for inode_setattr being removed Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- fs/9p/vfs_inode.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index f027a42..2ec7bfa 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -1052,10 +1052,19 @@ static int v9fs_vfs_setattr_dotl(struct dentry *dentry, struct iattr *iattr) return PTR_ERR(fid); retval = p9_client_setattr(fid, &p9attr); - if (retval >= 0) - retval = inode_setattr(dentry->d_inode, iattr); + if (retval < 0) + return retval; - return retval; + if ((iattr->ia_valid & ATTR_SIZE) && + iattr->ia_size != i_size_read(dentry->d_inode)) { + retval = vmtruncate(dentry->d_inode, iattr->ia_size); + if (retval) + return retval; + } + + setattr_copy(dentry->d_inode, iattr); + mark_inode_dirty(dentry->d_inode); + return 0; } /** -- 1.7.1 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html