Removed the broken PROC_EVENT and SYN_ALARM from VFS

diff --git a/include/minix/com.h b/include/minix/com.h
index 47e781c853493dd09653461a6794ef193b8a9a70..33c8609803a559426c908263970d83507fde0c0f 100755 (executable)
--- 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 945a4cc1d0b89432d5169cf73cc7acc98f51156e..8b47583c7bb57584a8532318ef3b85483055b315 100644 (file)
--- 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.