Blame SOURCES/autofs-5.1.7-fix-return-from-umount_subtree_mounts-on-offset-list-delete.patch

49b67f
autofs-5.1.7 - fix return from umount_subtree_mounts() on offset list delete
49b67f
49b67f
From: Ian Kent <raven@themaw.net>
49b67f
49b67f
When there are no mounts left in a subtree of offset mounts the offset
49b67f
list is deleted. If all goes well deleting the list this shouldn't cause
49b67f
a positive return from umount_subtree_mounts() (essentially saying not
49b67f
the umount of the subtree has not succeeded).
49b67f
49b67f
Signed-off-by: Ian Kent <raven@themaw.net>
49b67f
---
49b67f
 CHANGELOG          |    1 +
49b67f
 daemon/automount.c |    5 +++--
49b67f
 2 files changed, 4 insertions(+), 2 deletions(-)
49b67f
49b67f
--- autofs-5.1.4.orig/CHANGELOG
49b67f
+++ autofs-5.1.4/CHANGELOG
49b67f
@@ -15,6 +15,7 @@
49b67f
 - simplify mount_subtree() mount check.
49b67f
 - fix mnts_get_expire_list() expire list construction.
49b67f
 - fix inconsistent locking in umount_subtree_mounts().
49b67f
+- fix return from umount_subtree_mounts() on offset list delete.
49b67f
 
49b67f
 xx/xx/2018 autofs-5.1.5
49b67f
 - fix flag file permission.
49b67f
--- autofs-5.1.4.orig/daemon/automount.c
49b67f
+++ autofs-5.1.4/daemon/automount.c
49b67f
@@ -590,9 +590,10 @@ static int umount_subtree_mounts(struct
49b67f
 
49b67f
 		if (!left && is_mm_root) {
49b67f
 			status = cache_delete_offset_list(mc, me->key);
49b67f
-			if (status != CHE_OK)
49b67f
+			if (status != CHE_OK) {
49b67f
 				warn(ap->logopt, "couldn't delete offset list");
49b67f
-			left++;
49b67f
+				left++;
49b67f
+			}
49b67f
 		}
49b67f
 
49b67f
 		if (ap->entry->maps &&