From ccbcacd55127058601c94e30c22116408669213c Mon Sep 17 00:00:00 2001
From: Jason Baron <jbaron@redhat.com>
Date: Fri, 16 Mar 2012 16:34:03 -0400
Subject: [PATCH] --- yaml --- r: 288529 b: refs/heads/master c:
 93dc6107a76daed81c07f50215fa6ae77691634f h: refs/heads/master i:   288527:
 19f01ef6ec1cd91404b03f6d7d3d5b1f6cfb6538 v: v3

---
 [refs]               | 2 +-
 trunk/fs/eventpoll.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index faaf08c1da6c..d62a53f5c8f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c579bc7e316e7e3f3b56df5e17f623325caa9783
+refs/heads/master: 93dc6107a76daed81c07f50215fa6ae77691634f
diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c
index ea54cdef04dd..4d9d3a45e356 100644
--- a/trunk/fs/eventpoll.c
+++ b/trunk/fs/eventpoll.c
@@ -988,6 +988,10 @@ static int path_count[PATH_ARR_SIZE];
 
 static int path_count_inc(int nests)
 {
+	/* Allow an arbitrary number of depth 1 paths */
+	if (nests == 0)
+		return 0;
+
 	if (++path_count[nests] > path_limits[nests])
 		return -1;
 	return 0;