Correctly free /proc entries

* Apply upstream patch to free /proc entries in the correct order.
  Thanks, Marc Dionne.  (Closes: #493914)

diff --git a/debian/changelog b/debian/changelog
index 62823349510ab0588c563b691dd6389f13d1fbb7..204eaa6585328a3605f315db70618a71de864021 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 openafs (1.4.7.dfsg1-6) UNRELEASED; urgency=low
 
+  * Apply upstream patch to free /proc entries in the correct order.
+    Thanks, Marc Dionne.  (Closes: #493914)
   * Translation updates:
     - Swedish, thanks Martin Bagge.  (Closes: #493120)
 

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index ef672402a8146a720ed7a0a12d0d3ed65b9aa08d..1f2674bc49dea743f83e6f13e7889f7345c12762 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -275,18 +275,18 @@ afsproc_exit(void)
     char path[64];
 #endif
 
-#if defined(EXPORTED_PROC_ROOT_FS)
-    remove_proc_entry(PROC_FSDIRNAME, proc_root_fs);
-#else
-    sprintf(path, "fs/%s", PROC_FSDIRNAME);
-    remove_proc_entry(path, NULL);
-#endif
     remove_proc_entry(PROC_CELLSERVDB_NAME, openafs_procfs);
     remove_proc_entry(PROC_SYSCALL_NAME, openafs_procfs);
 #if defined(NEED_IOCTL32) && !defined(HAVE_COMPAT_IOCTL)
     if (ioctl32_done)
            unregister_ioctl32_conversion(VIOC_SYSCALL32);
 #endif
+#if defined(EXPORTED_PROC_ROOT_FS)
+    remove_proc_entry(PROC_FSDIRNAME, proc_root_fs);
+#else
+    sprintf(path, "fs/%s", PROC_FSDIRNAME);
+    remove_proc_entry(path, NULL);
+#endif
 }
 #endif