From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sat, 11 Jun 2011 17:43:45 +0000 (-0400)
Subject: Revert "Update pollwait explusive"
X-Git-Tag: v2.0-pre1~53
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=9f58ffec9e6d2c9871913f459616e13d4014224c;p=lttng-modules.git

Revert "Update pollwait explusive"

This reverts commit 67a00fae87ee17fd0a59c28b732347ee503fb07e.
---

diff --git a/wrapper/poll.c b/wrapper/poll.c
index 94142ff3..f3f76fea 100644
--- a/wrapper/poll.c
+++ b/wrapper/poll.c
@@ -1,32 +1,31 @@
 /*
  * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
  *
- * wrapper around poll_get_entry, implementing __pollwait with exclusive
- * wakeups. Using KALLSYMS to get poll_get_entry address when available,
- * else we need to have a kernel that exports this function to GPL
- * modules.
+ * wrapper around poll __pollwait and poll_get_entry. Using KALLSYMS to get its
+ * address when available, else we need to have a kernel that exports this
+ * function to GPL modules.
  *
- * GPL v2 license.
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #ifdef CONFIG_KALLSYMS
 
 #include <linux/kallsyms.h>
 #include <linux/poll.h>
-#include <linux/wait.h>
 
 struct poll_table_entry;
 struct splice_pipe_desc;
 
 static
-int (*pollwake_sym)(wait_queue_t *wait, unsigned mode, int sync, void *key);
+void (*__pollwait_sym)(struct file *filp, wait_queue_head_t *wait_address,
+		poll_table *p);
 static
 struct poll_table_entry *(*poll_get_entry_sym)(struct poll_wqueues *p);
 
-/* Add a new entry */
-static void __pollwait_exclusive(struct file *filp,
-				 wait_queue_head_t *wait_address,
-				 poll_table *p)
+void wrapper_pollwait_exclusive(struct file *filp,
+			 wait_queue_head_t *wait_address,
+			 poll_table *p)
+
 {
 	struct poll_wqueues *pwq = container_of(p, struct poll_wqueues, pt);
 	struct poll_table_entry *entry;
@@ -37,33 +36,15 @@ static void __pollwait_exclusive(struct file *filp,
 		printk(KERN_WARNING "LTTng: poll_get_entry_sym symbol lookup failed.\n");
 		return;
 	}
-
-	if (!pollwake_sym)
-		pollwake_sym = (void *) kallsyms_lookup_name("pollwake");
-	if (!pollwake_sym) {
-		printk(KERN_WARNING "LTTng: pollwake_sym symbol lookup failed.\n");
-		return;
-	}
-
 	entry = poll_get_entry_sym(pwq);
 
-	if (!entry)
+	if (!__pollwait_sym)
+		__pollwait_sym = (void *) kallsyms_lookup_name("__pollwait");
+	if (!__pollwait_sym) {
+		printk(KERN_WARNING "LTTng: __pollwait symbol lookup failed.\n");
 		return;
-	get_file(filp);
-	entry->filp = filp;
-	entry->wait_address = wait_address;
-	entry->key = p->key;
-	init_waitqueue_func_entry(&entry->wait, pollwake_sym);
-	entry->wait.private = pwq;
-	add_wait_queue_exclusive(wait_address, &entry->wait);
-}
-
-void wrapper_pollwait_exclusive(struct file *filp,
-			 wait_queue_head_t *wait_address,
-			 poll_table *p)
-
-{
-	__pollwait_exclusive(filp, wait_address, p);
+	}
+	return __pollwait_sym(filp, wait_address, p);
 }
 
 #else