Alter the expire semantics that define how "busyness" is determined.
Currently a last_used counter is updated on every revalidate from processes
other than the mount owner process group.
This patch changes that so that an expire candidate is busy only if it has a
reference count greater than the expected minimum, such as when there is an
open file or working directory in use.
This method is the only way that busyness can be established for direct mounts
within the new implementation. For consistency the expire semantic is made
the same for all mounts.
A side effect of the patch is that mounts which remain mounted unessessarily
in the presence of some GUI programs that scan the filesystem should now
expire.
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
/* Check a mount point for busyness */
static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry)
{
/* Check a mount point for busyness */
static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry)
{
+ struct dentry *top = dentry;
int status = 1;
DPRINTK("dentry %p %.*s",
int status = 1;
DPRINTK("dentry %p %.*s",
if (is_autofs4_dentry(dentry))
goto done;
if (is_autofs4_dentry(dentry))
goto done;
- /* The big question */
- if (may_umount_tree(mnt) == 0)
- status = 0;
+ /* Update the expiry counter if fs is busy */
+ if (may_umount_tree(mnt)) {
+ struct autofs_info *ino = autofs4_dentry_ino(top);
+ ino->last_used = jiffies;
+ goto done;
+ }
+
+ status = 0;
done:
DPRINTK("returning = %d", status);
mntput(mnt);
done:
DPRINTK("returning = %d", status);
mntput(mnt);
unsigned long timeout,
int do_now)
{
unsigned long timeout,
int do_now)
{
- struct autofs_info *ino;
+ struct autofs_info *top_ino = autofs4_dentry_ino(top);
struct dentry *p;
DPRINTK("top %p %.*s",
struct dentry *p;
DPRINTK("top %p %.*s",
* Is someone visiting anywhere in the subtree ?
* If there's no mount we need to check the usage
* count for the autofs dentry.
* Is someone visiting anywhere in the subtree ?
* If there's no mount we need to check the usage
* count for the autofs dentry.
+ * If the fs is busy update the expiry counter.
- ino = autofs4_dentry_ino(p);
if (d_mountpoint(p)) {
if (autofs4_mount_busy(mnt, p)) {
if (d_mountpoint(p)) {
if (autofs4_mount_busy(mnt, p)) {
+ top_ino->last_used = jiffies;
dput(p);
return 1;
}
} else {
dput(p);
return 1;
}
} else {
+ struct autofs_info *ino = autofs4_dentry_ino(p);
unsigned int ino_count = atomic_read(&ino->count);
/* allow for dget above and top is already dgot */
unsigned int ino_count = atomic_read(&ino->count);
/* allow for dget above and top is already dgot */
ino_count++;
if (atomic_read(&p->d_count) > ino_count) {
ino_count++;
if (atomic_read(&p->d_count) > ino_count) {
+ top_ino->last_used = jiffies;
spin_unlock(&dcache_lock);
if (d_mountpoint(p)) {
spin_unlock(&dcache_lock);
if (d_mountpoint(p)) {
- /* Can we expire this guy */
- if (!autofs4_can_expire(p, timeout, do_now))
+ /* Can we umount this guy */
+ if (autofs4_mount_busy(mnt, p))
- /* Can we umount this guy */
- if (!autofs4_mount_busy(mnt, p))
+ /* Can we expire this guy */
+ if (autofs4_can_expire(p, timeout, do_now))
DPRINTK("checking mountpoint %p %.*s",
dentry, (int)dentry->d_name.len, dentry->d_name.name);
DPRINTK("checking mountpoint %p %.*s",
dentry, (int)dentry->d_name.len, dentry->d_name.name);
- /* Can we expire this guy */
- if (!autofs4_can_expire(dentry, timeout, do_now))
+ /* Can we umount this guy */
+ if (autofs4_mount_busy(mnt, dentry))
- /* Can we umount this guy */
- if (!autofs4_mount_busy(mnt, dentry)) {
+ /* Can we expire this guy */
+ if (autofs4_can_expire(dentry, timeout, do_now)) {
expired = dentry;
break;
}
expired = dentry;
break;
}
if (!autofs4_oz_mode(sbi))
autofs4_update_usage(mnt, dentry);
if (!autofs4_oz_mode(sbi))
autofs4_update_usage(mnt, dentry);
+ /* Initialize expiry counter after successful mount */
+ if (ino)
+ ino->last_used = jiffies;
+
spin_lock(&dentry->d_lock);
dentry->d_flags &= ~DCACHE_AUTOFS_PENDING;
spin_unlock(&dentry->d_lock);
spin_lock(&dentry->d_lock);
dentry->d_flags &= ~DCACHE_AUTOFS_PENDING;
spin_unlock(&dentry->d_lock);