Commit 5a30d8a2 authored by David Howells's avatar David Howells Committed by Al Viro

VFS: Fix automount for negative autofs dentries

Autofs may set the DCACHE_NEED_AUTOMOUNT flag on negative dentries.  These
need attention from the automounter daemon regardless of the LOOKUP_FOLLOW flag.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b4aff1f8
...@@ -716,19 +716,25 @@ static int follow_automount(struct path *path, unsigned flags, ...@@ -716,19 +716,25 @@ static int follow_automount(struct path *path, unsigned flags,
if ((flags & LOOKUP_NO_AUTOMOUNT) && !(flags & LOOKUP_PARENT)) if ((flags & LOOKUP_NO_AUTOMOUNT) && !(flags & LOOKUP_PARENT))
return -EISDIR; /* we actually want to stop here */ return -EISDIR; /* we actually want to stop here */
/* We want to mount if someone is trying to open/create a file of any /*
* type under the mountpoint, wants to traverse through the mountpoint
* or wants to open the mounted directory.
*
* We don't want to mount if someone's just doing a stat and they've * We don't want to mount if someone's just doing a stat and they've
* set AT_SYMLINK_NOFOLLOW - unless they're stat'ing a directory and * set AT_SYMLINK_NOFOLLOW - unless they're stat'ing a directory and
* appended a '/' to the name. * appended a '/' to the name.
*/ */
if (!(flags & LOOKUP_FOLLOW) && if (!(flags & LOOKUP_FOLLOW)) {
!(flags & (LOOKUP_PARENT | LOOKUP_DIRECTORY | /* We do, however, want to mount if someone wants to open or
LOOKUP_OPEN | LOOKUP_CREATE))) * create a file of any type under the mountpoint, wants to
* traverse through the mountpoint or wants to open the mounted
* directory.
* Also, autofs may mark negative dentries as being automount
* points. These will need the attentions of the daemon to
* instantiate them before they can be used.
*/
if (!(flags & (LOOKUP_PARENT | LOOKUP_DIRECTORY |
LOOKUP_OPEN | LOOKUP_CREATE)) &&
path->dentry->d_inode)
return -EISDIR; return -EISDIR;
}
current->total_link_count++; current->total_link_count++;
if (current->total_link_count >= 40) if (current->total_link_count >= 40)
return -ELOOP; return -ELOOP;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment