diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /fs/autofs4/root.c | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'fs/autofs4/root.c')
| -rw-r--r-- | fs/autofs4/root.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index 8ff33b344..41dc98984 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -181,7 +181,7 @@ static int try_to_fill_dentry(struct dentry *dentry, /* If this is an unused directory that isn't a mount point, bitch at the daemon and fix it in user space */ if (S_ISDIR(dentry->d_inode->i_mode) && - dentry->d_mounts == dentry && + !d_mountpoint(dentry) && list_empty(&dentry->d_subdirs)) { DPRINTK(("try_to_fill_entry: mounting existing dir\n")); return autofs4_wait(sbi, &dentry->d_name, NFY_MOUNT) == 0; @@ -226,7 +226,7 @@ static int autofs4_root_revalidate(struct dentry * dentry, int flags) /* Check for a non-mountpoint directory with no contents */ if (S_ISDIR(dentry->d_inode->i_mode) && - dentry->d_mounts == dentry && + !d_mountpoint(dentry) && list_empty(&dentry->d_subdirs)) { DPRINTK(("autofs_root_revalidate: dentry=%p %.*s, emptydir\n", dentry, dentry->d_name.len, dentry->d_name.name)); |