From: Maneesh Soni <maneesh@in.ibm.com>
To: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Andrew Morton <akpm@osdl.org>,
Dick Streefland <dick.streefland@xs4all.nl>,
Linux Kernel List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] autofs4 doesn't expire
Date: Wed, 6 Aug 2003 10:30:03 +0530 [thread overview]
Message-ID: <20030806050003.GB1298@in.ibm.com> (raw)
In-Reply-To: <1060144454.18625.5.camel@ixodes.goop.org>
On Tue, Aug 05, 2003 at 09:34:14PM -0700, Jeremy Fitzhardinge wrote:
> On Tue, 2003-08-05 at 21:28, Maneesh Soni wrote:
> > Sorry, I don't think it is correct. This code is called under dcache_lock,
> > taken in is_tree_busy(). mntput() calls dput() and which can lead to deadlock.
>
> Urk. On the other hand, it only calls dput if the refcount drops to
> zero, which it can't because there's already a reference (hence the -2
> in is_vfsmnt_tree_busy).
>
> I'm not too keen on releasing dcache lock, since the whole point is to
> keep the dcache tree stable while we traverse it.
yeah.. that is the problem in release dcache_lock there. How about just
doing atomic_dec(&vfs->mnt_count) in place of mntput()? This is also ugly,
but otherwise we have to re-write the entire is_tree_busy() thing.
>
> > @@ -71,7 +74,8 @@ static int check_vfsmnt(struct vfsmount
> > struct vfsmount *vfs = lookup_mnt(mnt, dentry);
> >
> > if (vfs && is_vfsmnt_tree_busy(vfs))
> > - ret--;
> > + ret = 0;
>
> Erm, why?
>
oh.. it should be ret--. I just copied Andrew's code. Following is the
corrected patch
fs/autofs4/expire.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff -puN fs/autofs4/expire.c~autofs4-vfsmount-fix fs/autofs4/expire.c
--- linux-2.6.0-test2/fs/autofs4/expire.c~autofs4-vfsmount-fix 2003-08-06 09:10:49.000000000 +0530
+++ linux-2.6.0-test2-maneesh/fs/autofs4/expire.c 2003-08-06 10:25:58.000000000 +0530
@@ -25,7 +25,10 @@ static inline int is_vfsmnt_tree_busy(st
struct list_head *next;
int count;
- count = atomic_read(&mnt->mnt_count) - 1;
+ /* -1 for vfsmount's normal count,
+ * -1 for ref taken in lookup_mnt()
+ */
+ count = atomic_read(&mnt->mnt_count) - 1 - 1;
repeat:
next = this_parent->mnt_mounts.next;
@@ -70,8 +73,14 @@ static int check_vfsmnt(struct vfsmount
int ret = dentry->d_mounted;
struct vfsmount *vfs = lookup_mnt(mnt, dentry);
- if (vfs && is_vfsmnt_tree_busy(vfs))
- ret--;
+ if (vfs) {
+ if (is_vfsmnt_tree_busy(vfs))
+ ret--;
+ /* just to reduce ref count taken in lookup_mnt
+ * cannot call mntput() here
+ */
+ atomic_dec(&vfs->mnt_count);
+ }
DPRINTK(("check_vfsmnt: ret=%d\n", ret));
return ret;
}
_
--
Maneesh Soni
IBM Linux Technology Center,
IBM India Software Lab, Bangalore.
Phone: +91-80-5044999 email: maneesh@in.ibm.com
http://lse.sourceforge.net/
next prev parent reply other threads:[~2003-08-06 4:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-08-05 22:16 [PATCH] autofs4 doesn't expire Dick Streefland
2003-08-05 23:49 ` Andrew Morton
2003-08-06 0:03 ` Jeremy Fitzhardinge
2003-08-06 4:28 ` Maneesh Soni
2003-08-06 4:34 ` Jeremy Fitzhardinge
2003-08-06 5:00 ` Maneesh Soni [this message]
2003-08-06 5:01 ` Jeremy Fitzhardinge
2003-08-06 5:08 ` Andrew Morton
2003-08-06 5:38 ` Maneesh Soni
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=20030806050003.GB1298@in.ibm.com \
--to=maneesh@in.ibm.com \
--cc=akpm@osdl.org \
--cc=dick.streefland@xs4all.nl \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
/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).