From 5d9ed3562250bc4ab063c4406f8e836d6db4d6e8 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Apr 16 2021 22:14:00 +0000
Subject: Apply patch autofs-5.1.7-fix-return-from-umount_subtree_mounts-on-offset-list-delete.patch


patch_name: autofs-5.1.7-fix-return-from-umount_subtree_mounts-on-offset-list-delete.patch
present_in_specfile: true

---

diff --git a/CHANGELOG b/CHANGELOG
index 8dfe395..dcfd016 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@
 - simplify mount_subtree() mount check.
 - fix mnts_get_expire_list() expire list construction.
 - fix inconsistent locking in umount_subtree_mounts().
+- fix return from umount_subtree_mounts() on offset list delete.
 
 xx/xx/2018 autofs-5.1.5
 - fix flag file permission.
diff --git a/daemon/automount.c b/daemon/automount.c
index 02daee0..74fcd7d 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -590,9 +590,10 @@ static int umount_subtree_mounts(struct autofs_point *ap, const char *path, unsi
 
 		if (!left && is_mm_root) {
 			status = cache_delete_offset_list(mc, me->key);
-			if (status != CHE_OK)
+			if (status != CHE_OK) {
 				warn(ap->logopt, "couldn't delete offset list");
-			left++;
+				left++;
+			}
 		}
 
 		if (ap->entry->maps &&