From: "J. Bruce Fields" <bfields@redhat.com>
To: Jeff Layton <jlayton@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 09/12] locks: helper functions for delegation breaking
Date: Tue, 9 Jul 2013 15:31:25 -0400 [thread overview]
Message-ID: <20130709193124.GH32574@pad.fieldses.org> (raw)
In-Reply-To: <20130709090952.0afe9503@tlielax.poochiereds.net>
On Tue, Jul 09, 2013 at 09:09:52AM -0400, Jeff Layton wrote:
> On Wed, 3 Jul 2013 16:12:33 -0400
> "J. Bruce Fields" <bfields@redhat.com> wrote:
>
> > From: "J. Bruce Fields" <bfields@redhat.com>
> >
> > We'll need the same logic for rename and link.
> >
> > Signed-off-by: J. Bruce Fields <bfields@redhat.com>
> > ---
> > fs/namei.c | 13 +++----------
> > include/linux/fs.h | 33 +++++++++++++++++++++++++++++++--
> > 2 files changed, 34 insertions(+), 12 deletions(-)
> >
> > diff --git a/fs/namei.c b/fs/namei.c
> > index cba3db1..a9d4031 100644
> > --- a/fs/namei.c
> > +++ b/fs/namei.c
> > @@ -3401,14 +3401,9 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry, struct inode **delegate
> > else {
> > error = security_inode_unlink(dir, dentry);
> > if (!error) {
> > - error = break_deleg(target, O_WRONLY|O_NONBLOCK);
> > - if (error) {
> > - if (error == -EWOULDBLOCK && delegated_inode) {
> > - *delegated_inode = target;
> > - ihold(target);
> > - }
> > + error = try_break_deleg(target, delegated_inode);
> > + if (error)
> > goto out;
> > - }
> > error = dir->i_op->unlink(dir, dentry);
> > if (!error)
> > dont_mount(dentry);
> > @@ -3478,9 +3473,7 @@ exit2:
> > iput(inode); /* truncate the inode here */
> > inode = NULL;
> > if (delegated_inode) {
> > - error = break_deleg(delegated_inode, O_WRONLY);
> > - iput(delegated_inode);
> > - delegated_inode = NULL;
> > + error = break_deleg_wait(&delegated_inode);
> > if (!error)
> > goto retry_deleg;
> > }
> > diff --git a/include/linux/fs.h b/include/linux/fs.h
> > index f951588..c37e463 100644
> > --- a/include/linux/fs.h
> > +++ b/include/linux/fs.h
> > @@ -1894,6 +1894,9 @@ extern bool our_mnt(struct vfsmount *mnt);
> >
> > extern int current_umask(void);
> >
> > +extern void ihold(struct inode * inode);
> > +extern void iput(struct inode *);
> > +
> > /* /sys/fs */
> > extern struct kobject *fs_kobj;
> >
> > @@ -1962,6 +1965,28 @@ static inline int break_deleg(struct inode *inode, unsigned int mode)
> > return 0;
> > }
> >
> > +static inline int try_break_deleg(struct inode *inode, struct inode **delegated_inode)
> > +{
> > + int ret;
> > +
> > + ret = break_deleg(inode, O_WRONLY|O_NONBLOCK);
> > + if (ret == -EWOULDBLOCK && delegated_inode) {
> > + *delegated_inode = inode;
> > + ihold(inode);
> > + }
> > + return ret;
> > +}
> > +
> > +static inline int break_deleg_wait(struct inode **delegated_inode)
> > +{
> > + int ret;
> > +
> > + ret = break_deleg(*delegated_inode, O_WRONLY);
> > + iput(*delegated_inode);
> > + *delegated_inode = NULL;
> > + return ret;
> > +}
> > +
> > #else /* !CONFIG_FILE_LOCKING */
> > static inline int locks_mandatory_locked(struct inode *inode)
> > {
> > @@ -2005,6 +2030,12 @@ static inline int break_deleg(struct inode *inode, unsigned int mode)
> > {
> > return 0;
> > }
> > +
> > +static inline int try_break_deleg(struct inode *inode, struct delegated_inode **inode)
> > +{
> > + return 0;
> > +}
> > +
> > #endif /* CONFIG_FILE_LOCKING */
> >
> > /* fs/open.c */
> > @@ -2335,8 +2366,6 @@ extern loff_t vfs_llseek(struct file *file, loff_t offset, int whence);
> > extern int inode_init_always(struct super_block *, struct inode *);
> > extern void inode_init_once(struct inode *);
> > extern void address_space_init_once(struct address_space *mapping);
> > -extern void ihold(struct inode * inode);
> > -extern void iput(struct inode *);
> > extern struct inode * igrab(struct inode *);
> > extern ino_t iunique(struct super_block *, ino_t);
> > extern int inode_needs_sync(struct inode *inode);
>
> Nice cleanup. Might be reasonable to reorder or merge this patch with
> the previous one to reduce "churn" in vfs_unlink.
That's how I first did it then I thought "eh, there's a way I could make
this patch a little smaller...". Seemed like it might be a tad easier
to review this way. Up to you.
--b.
>
> Acked-by: Jeff Layton <jlayton@redhat.com>
next prev parent reply other threads:[~2013-07-09 19:31 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 20:12 [PATCH 00/12] Implement NFSv4 delegations, take 8 J. Bruce Fields
2013-07-03 20:12 ` [PATCH 01/12] vfs: pull ext4's double-i_mutex-locking into common code J. Bruce Fields
2013-07-09 10:49 ` Jeff Layton
2013-07-09 15:48 ` Theodore Ts'o
2013-07-09 22:04 ` Dave Chinner
2013-07-10 0:21 ` J. Bruce Fields
2013-07-10 2:09 ` Dave Chinner
2013-07-10 2:40 ` J. Bruce Fields
2013-07-10 3:38 ` Dave Chinner
2013-07-10 21:26 ` J. Bruce Fields
2013-07-11 14:04 ` Jeff Layton
2013-07-12 22:07 ` J. Bruce Fields
2013-07-03 20:12 ` [PATCH 02/12] vfs: don't use PARENT/CHILD lock classes for non-directories J. Bruce Fields
2013-07-09 10:50 ` Jeff Layton
2013-07-03 20:12 ` [PATCH 03/12] vfs: rename I_MUTEX_QUOTA now that it's not used for quotas J. Bruce Fields
2013-07-09 10:54 ` Jeff Layton
2013-07-09 14:26 ` J. Bruce Fields
2013-07-09 14:31 ` Jeff Layton
2013-07-03 20:12 ` [PATCH 04/12] vfs: take i_mutex on renamed file J. Bruce Fields
2013-07-09 10:59 ` Jeff Layton
2013-07-03 20:12 ` [PATCH 05/12] locks: introduce new FL_DELEG lock flag J. Bruce Fields
2013-07-09 11:00 ` Jeff Layton
2013-07-03 20:12 ` [PATCH 06/12] locks: implement delegations J. Bruce Fields
2013-07-09 12:23 ` Jeff Layton
2013-07-09 14:41 ` J. Bruce Fields
2013-07-03 20:12 ` [PATCH 07/12] namei: minor vfs_unlink cleanup J. Bruce Fields
2013-07-09 12:50 ` Jeff Layton
2013-07-03 20:12 ` [PATCH 08/12] locks: break delegations on unlink J. Bruce Fields
2013-07-09 13:05 ` Jeff Layton
2013-07-09 13:07 ` Jeff Layton
2013-07-09 15:58 ` J. Bruce Fields
2013-07-09 16:02 ` Jeff Layton
2013-07-09 19:29 ` J. Bruce Fields
2013-07-03 20:12 ` [PATCH 09/12] locks: helper functions for delegation breaking J. Bruce Fields
2013-07-09 13:09 ` Jeff Layton
2013-07-09 19:31 ` J. Bruce Fields [this message]
2013-07-09 19:37 ` Jeff Layton
2013-07-09 13:23 ` Jeff Layton
2013-07-09 19:38 ` J. Bruce Fields
2013-07-09 20:28 ` Jeff Layton
2013-07-03 20:12 ` [PATCH 10/12] locks: break delegations on rename J. Bruce Fields
2013-07-09 13:14 ` Jeff Layton
2013-07-03 20:12 ` [PATCH 11/12] locks: break delegations on link J. Bruce Fields
2013-07-09 13:16 ` Jeff Layton
2013-07-09 20:41 ` J. Bruce Fields
2013-07-03 20:12 ` [PATCH 12/12] locks: break delegations on any attribute modification J. Bruce Fields
2013-07-09 13:30 ` Jeff Layton
2013-07-09 20:51 ` J. Bruce Fields
2013-07-09 21:19 ` J. Bruce Fields
2013-07-10 1:26 ` Jeff Layton
2013-07-10 19:33 ` J. Bruce Fields
2013-07-09 23:57 ` Jeff Layton
-- strict thread matches above, loose matches on Subject: below --
2013-09-05 16:30 [PATCH 00/12] Implement NFSv4 delegations, take 10 J. Bruce Fields
2013-09-05 16:30 ` [PATCH 09/12] locks: helper functions for delegation breaking J. Bruce Fields
2013-04-17 1:46 [PATCH 00/12] Implement NFSv4 delegations, take 7 J. Bruce Fields
2013-04-17 1:46 ` [PATCH 09/12] locks: helper functions for delegation breaking J. Bruce Fields
2013-02-03 16:31 [PATCH 00/12] Implement NFSv4 delegations, take 6 J. Bruce Fields
2013-02-03 16:31 ` [PATCH 09/12] locks: helper functions for delegation breaking J. Bruce Fields
2012-10-16 22:01 [PATCH 00/12] Implement NFSv4 delegations, take 5 J. Bruce Fields
2012-10-16 22:01 ` [PATCH 09/12] locks: helper functions for delegation breaking J. Bruce Fields
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=20130709193124.GH32574@pad.fieldses.org \
--to=bfields@redhat.com \
--cc=jlayton@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).