From: Christoph Hellwig <hch@infradead.org>
To: Dave Chinner <david@fromorbit.com>
Cc: Christoph Hellwig <hch@infradead.org>,
viro@zeniv.linux.org.uk, eparis@redhat.com,
linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 00/10] dcache cleanups
Date: Wed, 13 Oct 2010 11:56:37 -0400 [thread overview]
Message-ID: <20101013155637.GA22447@infradead.org> (raw)
In-Reply-To: <20101013112213.GB15683@infradead.org>
Found the bug. I did a small cleanup after testing the patch
and inverted a condition. The correct one is below:
---
From: Christoph Hellwig <hch@lst.de>
Subject: exportfs: 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.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/fs/exportfs/expfs.c
===================================================================
--- linux-2.6.orig/fs/exportfs/expfs.c 2010-10-11 16:58:59.533088586 -0400
+++ linux-2.6/fs/exportfs/expfs.c 2010-10-13 09:54:41.070259168 -0400
@@ -74,21 +74,20 @@ static struct dentry *
find_disconnected_root(struct dentry *dentry)
{
dget(dentry);
- spin_lock(&dentry->d_lock);
- while (!IS_ROOT(dentry) &&
- (dentry->d_parent->d_flags & DCACHE_DISCONNECTED)) {
- struct dentry *parent = dentry->d_parent;
- dget(parent);
- spin_unlock(&dentry->d_lock);
+ while (!IS_ROOT(dentry)) {
+ struct dentry *parent = dget_parent(dentry);
+
+ if (!(parent->d_flags & DCACHE_DISCONNECTED)) {
+ dput(parent);
+ break;
+ }
+
dput(dentry);
dentry = parent;
- spin_lock(&dentry->d_lock);
}
- spin_unlock(&dentry->d_lock);
return dentry;
}
-
/*
* Make sure target_dir is fully connected to the dentry tree.
*
next prev parent reply other threads:[~2010-10-13 15:56 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
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 [this message]
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=20101013155637.GA22447@infradead.org \
--to=hch@infradead.org \
--cc=david@fromorbit.com \
--cc=eparis@redhat.com \
--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).