diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 27e17f96cada..0ec24835239f 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -359,7 +359,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
 	 * don't try to mount it again.
 	 */
 	spin_lock(&dcache_lock);
-	if (!d_mountpoint(dentry) && list_empty(&dentry->d_subdirs)) {
+	if (!d_mountpoint(dentry) && __simple_empty(dentry)) {
 		spin_unlock(&dcache_lock);
 
 		status = try_to_fill_dentry(dentry, 0);