Sun Aug 9 21:09:24 1998 Jose M. Moya <josem@gnu.org>

	* diskfs.h (struct node): Add filemod_reqs member.
	(struct modreq): Rename struct dirmod to reqmod as it is used for
 	directory and file notifications.
	(diskfs_notice_filechange): Add prototype.
	* dir-chg.c (diskfs_S_dir_notice_changes): Check
 	nowait_dir_changed return value for errors.
	(diskfs_notice_dirchange): Remove requests when the notification
 	fails.
	* file-chg.c (diskfs_S_file_notice_changes): Implement.
	(diskfs_notice_filechange): New function.
	* node-make.c (diskfs_make_node): Initialize filemod_reqs.
	* node-drop.c (free_modreqs): New function.
	(diskfs_drop_node): Free filemod_reqs.
	* file-chauthor.c (dithkfth_TH_file_chauthor): Add file
 	notifications.
	* file-chflags.c (diskfs_S_file_chflags): Likewise.
	* file-chmod.c (diskfs_S_file_chmod): Likewise.
	* file-chown.c (diskfs_S_file_chown): Likewise.
	* file-set-size.c (diskfs_S_file_set_size): Likewise.
	* io-prenotify.c (diskfs_S_io_prenotify): Likewise.
	* io-write.c (diskfs_S_io_write): Likewise.
	* node-rdwr.c (diskfs_node_rdwr): Likewise.

1 files changed, 17 insertions, 9 deletions

diff --git a/libdiskfs/node-drop.c b/libdiskfs/node-drop.c
index 7c30f946..f44966ba 100644
--- a/libdiskfs/node-drop.c
+++ b/libdiskfs/node-drop.c
@@ -17,6 +17,20 @@
 
 #include "priv.h"
 
+/* Free the list of modification requests MR */
+static void
+free_modreqs (struct modreq *mr)
+{
+  struct modreq *tmp;
+  for (; mr; mr = tmp)
+    {
+      mach_port_deallocate (mach_task_self (), mr->port);
+      tmp = mr->next;
+      free (mr);
+    }
+}
+
+
 /* Node NP now has no more references; clean all state.  The
    diskfs_node_refcnt_lock must be held, and will be released
    upon return.  NP must be locked.  */
@@ -73,15 +87,9 @@ diskfs_drop_node (struct node *np)
   fshelp_drop_transbox (&np->transbox);
 
   if (np->dirmod_reqs)
-    {
-      struct dirmod *dm, *tmp;
-      for (dm = np->dirmod_reqs; dm; dm = tmp)
-	{
-	  mach_port_deallocate (mach_task_self (), dm->port);
-	  tmp = dm->next;
-	  free (dm);
-	}
-    }
+    free_modreqs (np->dirmod_reqs);
+  if (np->filemod_reqs)
+    free_modreqs (np->filemod_reqs);
 
   assert (!np->sockaddr);