From: Tomas Hruby <tom@minix3.org>
Date: Tue, 22 Sep 2009 22:11:20 +0000 (+0000)
Subject: Removed the broken PROC_EVENT and SYN_ALARM from VFS
X-Git-Tag: v3.1.5~101
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=f53377ed67d545cf1434d7c084309e60dd69aa6b;p=minix.git

Removed the broken PROC_EVENT and SYN_ALARM from VFS
---

diff --git a/include/minix/com.h b/include/minix/com.h
index 47e781c85..33c860980 100755
--- a/include/minix/com.h
+++ b/include/minix/com.h
@@ -62,6 +62,8 @@
  * offset are used for the per-process notification bit maps. 
  */
 #define NOTIFY_MESSAGE		  0x1000
+/* FIXME will be is_notify(a)		((a) == NOTIFY_MESSAGE) */
+#define is_notify(a)		((a) & NOTIFY_MESSAGE)
 #define NOTIFY_FROM(p_nr)	 (NOTIFY_MESSAGE | ((p_nr) + NR_TASKS)) 
 #  define PROC_EVENT	NOTIFY_FROM(PM_PROC_NR) /* process status change */
 #  define SYN_ALARM	NOTIFY_FROM(CLOCK) 	/* synchronous alarm */
diff --git a/servers/vfs/main.c b/servers/vfs/main.c
index 945a4cc1d..8b47583c7 100644
--- a/servers/vfs/main.c
+++ b/servers/vfs/main.c
@@ -111,13 +111,13 @@ PUBLIC int main(void)
 	}
 
  	/* Check for special control messages first. */
-        if ((call_nr & NOTIFY_MESSAGE)) {
-		if (call_nr == PROC_EVENT && who_e == PM_PROC_NR)
+        if (is_notify(call_nr)) {
+		if (who_p == PM_PROC_NR)
 		{
 			/* PM tries to get FS to do something */
 			service_pm();
 		}
-		else if (call_nr == SYN_ALARM && who_e == CLOCK)
+		else if (who_p == CLOCK)
 		{
 			/* Alarm timer expired. Used only for select().
 			 * Check it.