From: Eric Paris <eparis@redhat.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 10/10] fsnotify: use dget_parent
Date: Mon, 11 Oct 2010 09:59:22 -0400 [thread overview]
Message-ID: <1286805562.2795.10.camel@localhost.localdomain> (raw)
In-Reply-To: <20101010093722.745269700@canuck.infradead.org>
On Sun, 2010-10-10 at 05:36 -0400, Christoph Hellwig wrote:
> plain text document attachment (fsnotify-use-dget_parent)
> Use dget_parent instead of opencoding it. This simplifies the code, but
> more importanly prepares for the more complicated locking for a parent
> dget in the dcache scale patch series.
>
> It means we do grab a reference to the parent now if need to be watched,
> but not with the specified mask. If this turns out to be a problem
> we'll have to revisit it, but for now let's keep as much as possible
> dcache internals inside dcache.[ch].
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Nope this is fine, we were doing lots of extra work for little benefit
before.
Acked-by: Eric Paris <eparis@redhat.com>
> Index: linux-2.6/fs/notify/fsnotify.c
> ===================================================================
> --- linux-2.6.orig/fs/notify/fsnotify.c 2010-10-10 09:35:58.488004195 +0200
> +++ linux-2.6/fs/notify/fsnotify.c 2010-10-10 09:53:53.103010272 +0200
> @@ -88,8 +88,6 @@ void __fsnotify_parent(struct path *path
> {
> struct dentry *parent;
> struct inode *p_inode;
> - bool send = false;
> - bool should_update_children = false;
>
> if (!dentry)
> dentry = path->dentry;
> @@ -97,29 +95,12 @@ void __fsnotify_parent(struct path *path
> if (!(dentry->d_flags & DCACHE_FSNOTIFY_PARENT_WATCHED))
> return;
>
> - spin_lock(&dentry->d_lock);
> - parent = dentry->d_parent;
> + parent = dget_parent(dentry);
> p_inode = parent->d_inode;
>
> - if (fsnotify_inode_watches_children(p_inode)) {
> - if (p_inode->i_fsnotify_mask & mask) {
> - dget(parent);
> - send = true;
> - }
> - } else {
> - /*
> - * The parent doesn't care about events on it's children but
> - * at least one child thought it did. We need to run all the
> - * children and update their d_flags to let them know p_inode
> - * doesn't care about them any more.
> - */
> - dget(parent);
> - should_update_children = true;
> - }
> -
> - spin_unlock(&dentry->d_lock);
> -
> - if (send) {
> + if (unlikely(!fsnotify_inode_watches_children(p_inode)))
> + __fsnotify_update_child_dentry_flags(p_inode);
> + else if (p_inode->i_fsnotify_mask & mask) {
> /* we are notifying a parent so come up with the new mask which
> * specifies these are events which came from a child. */
> mask |= FS_EVENT_ON_CHILD;
> @@ -130,13 +111,9 @@ void __fsnotify_parent(struct path *path
> else
> fsnotify(p_inode, mask, dentry->d_inode, FSNOTIFY_EVENT_INODE,
> dentry->d_name.name, 0);
> - dput(parent);
> }
>
> - if (unlikely(should_update_children)) {
> - __fsnotify_update_child_dentry_flags(p_inode);
> - dput(parent);
> - }
> + dput(parent);
> }
> EXPORT_SYMBOL_GPL(__fsnotify_parent);
>
>
next prev parent reply other threads:[~2010-10-11 13:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-10 9:36 [PATCH 00/10] dcache cleanups Christoph Hellwig
2010-10-10 9:36 ` [PATCH 01/10] [PATCH] fs: take dcache_lock inside __d_path Christoph Hellwig
2010-10-10 9:36 ` [PATCH 02/10] fs: simplify __d_free Christoph Hellwig
2010-10-10 9:36 ` [PATCH 03/10] fs: use percpu counter for nr_dentry and nr_dentry_unused Christoph Hellwig
2010-10-10 9:36 ` [PATCH 04/10] fs: improve DCACHE_REFERENCED usage Christoph Hellwig
2010-10-10 9:36 ` [PATCH 05/10] fs: split __shrink_dcache_sb Christoph Hellwig
2010-10-10 9:36 ` [PATCH 06/10] fs: clean up dentry lru modification Christoph Hellwig
2010-10-10 9:36 ` [PATCH 07/10] fs: use RCU read side protection in d_validate Christoph Hellwig
2010-10-10 9:36 ` [PATCH 08/10] exportfs: use dget_parent Christoph Hellwig
2010-10-10 9:36 ` [PATCH 09/10] smbfs: " Christoph Hellwig
2010-10-10 9:36 ` [PATCH 10/10] fsnotify: " Christoph Hellwig
2010-10-11 13:59 ` Eric Paris [this message]
2010-10-13 1:04 ` [PATCH 00/10] dcache cleanups Dave Chinner
2010-10-13 11:21 ` Christoph Hellwig
2010-10-13 1:46 ` Dave Chinner
2010-10-13 11:22 ` Christoph Hellwig
2010-10-13 15:56 ` Christoph Hellwig
2010-10-16 8:17 ` Nick Piggin
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=1286805562.2795.10.camel@localhost.localdomain \
--to=eparis@redhat.com \
--cc=hch@infradead.org \
--cc=linux-fsdevel@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).