From d406930bb4190f5ee38efa5f5aa031e74c5c6b9c Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Sat, 24 Nov 2012 18:15:46 +0100
Subject: [PATCH] --- yaml --- r: 350079 b: refs/heads/master c:
 1ff6fee5e62c57d5923b805bb4206acb7953f16e h: refs/heads/master i:   350077:
 c61979b1f43670e4eed0afdcf9c8ab4fa4b6cefe   350075:
 1af239949860e6b5b3e9440f83d9d7e85ef12580   350071:
 96fd460a42648e03c08ca0e0981d022339b171e3   350063:
 d72c83e21e74931ad822f055d412c033e40d82e2   350047:
 d06e0db375f10e1d5d63a04ad7bb9134b06bbfa0   350015:
 6dfbc2c825af6ed4dd131579a599a6d33c766182   349951:
 fdb8f768ba40cd6df3532f503a27b41963626c2e v: v3

---
 [refs]                        |  2 +-
 trunk/kernel/events/uprobes.c | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index bf1260e51106..626b4b7e7917 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e591c8d78e49e6206935cf31c4d2b603bbb29166
+refs/heads/master: 1ff6fee5e62c57d5923b805bb4206acb7953f16e
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index 61d0fa6b5012..4d0452363686 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -614,14 +614,19 @@ static int prepare_uprobe(struct uprobe *uprobe, struct file *file,
 
 static bool filter_chain(struct uprobe *uprobe)
 {
-	/*
-	 * TODO:
-	 *	for_each_consumer(uc)
-	 *		if (uc->filter(...))
-	 *			return true;
-	 *	return false;
-	 */
-	return uprobe->consumers != NULL;
+	struct uprobe_consumer *uc;
+	bool ret = false;
+
+	down_read(&uprobe->consumer_rwsem);
+	for (uc = uprobe->consumers; uc; uc = uc->next) {
+		/* TODO: ret = uc->filter(...) */
+		ret = true;
+		if (ret)
+			break;
+	}
+	up_read(&uprobe->consumer_rwsem);
+
+	return ret;
 }
 
 static int