From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Al Viro <viro@zeniv•linux.org.uk>, Christoph Hellwig <hch@lst•de>,
Linus Torvalds <torvalds@linux-foundation•org>,
Eric Van Hensbergen <ericvh@gmail•com>,
Sripathi Kodi <sripathik@in•ibm.com>,
LKML <linux-kernel@vger•kernel.org>,
linux-next@vger•kernel.org
Subject: Re: remove inode_setattr
Date: Wed, 11 Aug 2010 10:45:03 +1000 [thread overview]
Message-ID: <20100811104503.4082f68f.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20100811101751.1afdded8.sfr@canb.auug.org.au>
Hi All,
On Wed, 11 Aug 2010 10:17:51 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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@canb•auug.org.au>
Date: Tue, 22 Jun 2010 11:15:01 +1000
Subject: [PATCH] v9fs: fixup for inode_setattr being removed
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next parent reply other threads:[~2010-08-11 0:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201008101859.o7AIx9BM026915@hera.kernel.org>
[not found] ` <20100810155011.b9657102.akpm@linux-foundation.org>
[not found] ` <20100811101751.1afdded8.sfr@canb.auug.org.au>
2010-08-11 0:45 ` Stephen Rothwell [this message]
2010-08-11 0:52 ` remove inode_setattr Al Viro
2010-08-11 0:59 ` Andrew Morton
2010-08-11 1:01 ` Al Viro
2010-08-11 1:00 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100811104503.4082f68f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=ericvh@gmail$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sripathik@in$(echo .)ibm.com \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox