From b9fa2775f493dd19f6d8cb5b6d0f787d6ff6550f Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Wed, 23 Jul 2008 21:30:25 -0700 Subject: [PATCH] --- yaml --- r: 105470 b: refs/heads/master c: 26e81b3142f1ba497d4cd0365c13661684b784ce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/autofs4/root.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5bc0bd81432f..988cc6b461f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff9cd499d6258952385cb2f12e9a3c0908fd5786 +refs/heads/master: 26e81b3142f1ba497d4cd0365c13661684b784ce diff --git a/trunk/fs/autofs4/root.c b/trunk/fs/autofs4/root.c index 51c873ca8e8d..61d1dca16884 100644 --- a/trunk/fs/autofs4/root.c +++ b/trunk/fs/autofs4/root.c @@ -177,7 +177,8 @@ static int try_to_fill_dentry(struct dentry *dentry, int flags) return status; } /* Trigger mount for path component or follow link */ - } else if (flags & (TRIGGER_FLAGS | TRIGGER_INTENTS) || + } else if (dentry->d_flags & DCACHE_AUTOFS_PENDING || + flags & (TRIGGER_FLAGS | TRIGGER_INTENTS) || current->link_count) { DPRINTK("waiting for mount name=%.*s", dentry->d_name.len, dentry->d_name.name); @@ -223,7 +224,8 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) /* If it's our master or we shouldn't trigger a mount we're done */ lookup_type = nd->flags & (TRIGGER_FLAGS | TRIGGER_INTENTS); - if (oz_mode || !lookup_type) + if (oz_mode || + !(lookup_type || dentry->d_flags & DCACHE_AUTOFS_PENDING)) goto done; /* If an expire request is pending wait for it. */ @@ -242,7 +244,8 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) * don't try to mount it again. */ spin_lock(&dcache_lock); - if (!d_mountpoint(dentry) && __simple_empty(dentry)) { + if (dentry->d_flags & DCACHE_AUTOFS_PENDING || + (!d_mountpoint(dentry) && __simple_empty(dentry))) { spin_unlock(&dcache_lock); status = try_to_fill_dentry(dentry, 0);