diff --git a/[refs] b/[refs]
index 37afee3a6fbd..5a2d2b71a715 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afec570c32a0d116e3c68af583ed1d11110f12fc
+refs/heads/master: cab0936aac8aa907c6bb814c2cf26385478f254b
diff --git a/trunk/fs/autofs4/waitq.c b/trunk/fs/autofs4/waitq.c
index 1fe28e4754c2..75e5955c3f6d 100644
--- a/trunk/fs/autofs4/waitq.c
+++ b/trunk/fs/autofs4/waitq.c
@@ -171,7 +171,7 @@ static int autofs4_getpath(struct autofs_sb_info *sbi,
 	for (tmp = dentry ; tmp != root ; tmp = tmp->d_parent)
 		len += tmp->d_name.len + 1;
 
-	if (--len > NAME_MAX) {
+	if (!len || --len > NAME_MAX) {
 		spin_unlock(&dcache_lock);
 		return 0;
 	}