diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /fs/autofs/dirhash.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'fs/autofs/dirhash.c')
| -rw-r--r-- | fs/autofs/dirhash.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/fs/autofs/dirhash.c b/fs/autofs/dirhash.c index 6dc3e4f60..168d7861b 100644 --- a/fs/autofs/dirhash.c +++ b/fs/autofs/dirhash.c @@ -34,7 +34,8 @@ void autofs_update_usage(struct autofs_dirhash *dh, } struct autofs_dir_ent *autofs_expire(struct super_block *sb, - struct autofs_sb_info *sbi) + struct autofs_sb_info *sbi, + struct vfsmount *mnt) { struct autofs_dirhash *dh = &sbi->dirhash; struct autofs_dir_ent *ent; @@ -79,12 +80,25 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb, DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name)); continue; } + mntget(mnt); + dget(dentry); + if (!follow_down(&mnt, &dentry)) { + dput(dentry); + mntput(mnt); + DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name)); + continue; + } + while (d_mountpoint(dentry) && follow_down(&mnt, &dentry)) + ; + dput(dentry); - if ( !is_root_busy(dentry->d_mounts) ) { + if ( may_umount(mnt) == 0 ) { + mntput(mnt); DPRINTK(("autofs: signaling expire on %s\n", ent->name)); return ent; /* Expirable! */ } - DPRINTK(("autofs: didn't expire due to is_root_busy: %s\n", ent->name)); + DPRINTK(("autofs: didn't expire due to may_umount: %s\n", ent->name)); + mntput(mnt); } return NULL; /* No expirable entries */ } |