From 60dc0c9841f4c4bebcf3a72ec7de254f54f0c3eb Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 22 Sep 2008 18:51:50 -0700 Subject: [PATCH] Correctly free /proc entries * Apply upstream patch to free /proc entries in the correct order. Thanks, Marc Dionne. (Closes: #493914) --- debian/changelog | 2 ++ src/afs/LINUX/osi_module.c | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 628233495..204eaa658 100644 --- 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 ef672402a..1f2674bc4 100644 --- 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 -- 2.39.5