Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

autofs4 - fix expire check

In some cases when an autofs indirect mount is contained in a file
system that is marked as shared (such as when systemd does the
equivalent of "mount --make-rshared /" early in the boot), mounts
stop expiring.

When this happens the first expiry check on a mountpoint dentry in
autofs_expire_indirect() sees a mountpoint dentry with a higher
than minimal reference count. Consequently the dentry is condidered
busy and the actual expiry check is never done.

This particular check was originally meant as an optimisation to
detect a path walk in progress but with the addition of rcu-walk
it can be ineffective anyway.

Removing the test allows automounts to expire again since the
actual expire check doesn't rely on the dentry reference count.

Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Ian Kent and committed by
Linus Torvalds
d807ff83 d9875690

-5
-5
fs/autofs4/expire.c
··· 399 399 DPRINTK("checking mountpoint %p %.*s", 400 400 dentry, (int)dentry->d_name.len, dentry->d_name.name); 401 401 402 - /* Path walk currently on this dentry? */ 403 - ino_count = atomic_read(&ino->count) + 2; 404 - if (dentry->d_count > ino_count) 405 - goto next; 406 - 407 402 /* Can we umount this guy */ 408 403 if (autofs4_mount_busy(mnt, dentry)) 409 404 goto next;