diff --git a/[refs] b/[refs]
index 7fa129a17641..1f7c220a1141 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4a85e35d1465da055264407d8395e84483084e6
+refs/heads/master: 83fb96bfc792e5ca693e53f7fd878d51b8493da8
diff --git a/trunk/fs/autofs4/root.c b/trunk/fs/autofs4/root.c
index 3a93d3552486..ebbfa0ce6d7b 100644
--- a/trunk/fs/autofs4/root.c
+++ b/trunk/fs/autofs4/root.c
@@ -444,6 +444,8 @@ int autofs4_d_manage(struct dentry *dentry, bool rcu_walk)
 
 	/* The daemon never waits. */
 	if (autofs4_oz_mode(sbi)) {
+		if (rcu_walk)
+			return 0;
 		if (!d_mountpoint(dentry))
 			return -EISDIR;
 		return 0;