1 files changed, 38 insertions, 12 deletions

diff --git a/libdiskfs/dir-chg.c b/libdiskfs/dir-chg.c
index 42dfb161..7ca34447 100644
--- a/libdiskfs/dir-chg.c
+++ b/libdiskfs/dir-chg.c
@@ -1,5 +1,5 @@
 /* Notifications of directory changes.
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1998, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -17,40 +17,66 @@
 
 #include "priv.h"
 #include "fs_S.h"
-#include "ourfs_notify_U.h"
+#include "fs_notify_U.h"
 
 kern_return_t
 diskfs_S_dir_notice_changes (struct protid *cred,
 			     mach_port_t notify)
 {
-  struct dirmod *req;
+  error_t err;
+  struct modreq *req;
   struct node *np;
-  
+
   if (!cred)
     return EOPNOTSUPP;
 
   np = cred->po->np;
-  req = malloc (sizeof (struct dirmod));
   mutex_lock (&np->lock);
   if (!S_ISDIR (np->dn_stat.st_mode))
     {
       mutex_unlock (&np->lock);
       return ENOTDIR;
     }
+  err = dir_changed (notify, np->dirmod_tick, DIR_CHANGED_NULL, "");
+  if (err)
+    {
+      mutex_unlock (&np->lock);
+      return err;
+    }
+  req = malloc (sizeof (struct modreq));
+  if (! req)
+    {
+      mutex_unlock (&np->lock);
+      return ENOMEM;
+    }
   req->port = notify;
   req->next = np->dirmod_reqs;
   np->dirmod_reqs = req;
-  nowait_dir_changed (notify, DIR_CHANGED_NULL, "");
   mutex_unlock (&np->lock);
   return 0;
 }
 
 void
 diskfs_notice_dirchange (struct node *dp, enum dir_changed_type type,
-			 char *name)
+			 const char *name)
 {
-  struct dirmod *req;
-  
-  for (req = dp->dirmod_reqs; req; req = req->next)
-    nowait_dir_changed (req->port, type, name);
-}  
+  error_t err;
+  struct modreq **preq;
+
+  dp->dirmod_tick++;
+  preq = &dp->dirmod_reqs;
+  while (*preq)
+    {
+      struct modreq *req = *preq;
+      err = dir_changed (req->port, dp->dirmod_tick, type, name);
+      if (err && err != MACH_SEND_TIMED_OUT)
+	{
+	  /* Remove notify port.  */
+	  *preq = req->next;
+	  mach_port_deallocate (mach_task_self (), req->port);
+	  free (req);
+	}
+      else
+	preq = &req->next;
+    }
+}