From bb24c1b1a8f117a37b56071e723b0ed132bbbc3c Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Mon, 4 May 2026 10:32:27 +0200
Subject: [PATCH] - Filesystem: do not return CONFIGURED during monitor-action

  Resolves: RHEL-159646
---
 ...urn-CONFIGURED-during-monitor-action.patch | 27 +++++++++++++++++++
 resource-agents.spec                          |  9 ++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 RHEL-159646-Filesystem-do-not-return-CONFIGURED-during-monitor-action.patch

diff --git a/RHEL-159646-Filesystem-do-not-return-CONFIGURED-during-monitor-action.patch b/RHEL-159646-Filesystem-do-not-return-CONFIGURED-during-monitor-action.patch
new file mode 100644
index 0000000..7379849
--- /dev/null
+++ b/RHEL-159646-Filesystem-do-not-return-CONFIGURED-during-monitor-action.patch
@@ -0,0 +1,27 @@
+From 46e305ab4cb80fb6e28d2f8a1d90587d1cb1b549 Mon Sep 17 00:00:00 2001
+From: SatomiOSAWA <satomi.t.osawa@gmail.com>
+Date: Wed, 18 Mar 2026 09:32:05 +0900
+Subject: [PATCH] Modify the return code when a mismatch between mount state
+ and configuration is detected in monitor operation.
+
+---
+ heartbeat/Filesystem | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
+index dda8e66e5..b4f16f17f 100755
+--- a/heartbeat/Filesystem
++++ b/heartbeat/Filesystem
+@@ -1029,7 +1029,11 @@ Filesystem_status()
+ 					rc=$OCF_NOT_RUNNING
+ 				else
+ 					ocf_exit_reason "Another device ($mounted_device) is already mounted on $MOUNTPOINT"
+-					rc=$OCF_ERR_CONFIGURED
++					if [ "$__OCF_ACTION" = "monitor" ]; then
++						rc=$OCF_ERR_GENERIC
++					else
++						rc=$OCF_ERR_CONFIGURED
++					fi
+ 				fi
+ 			fi
+ 		else
diff --git a/resource-agents.spec b/resource-agents.spec
index 55c2fb4..358fec0 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.16.0
-Release:	57%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	58%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
@@ -125,6 +125,7 @@ Patch72:	RHEL-156855-podman-etcd-handle-existing-peer-URLs-gracefully-during-for
 Patch73:	RHEL-150958-db2-set-reintegration-when-promotion-is-successful.patch
 Patch74:	RHEL-158905-podman-etcd-hardened-monitor-stop-actions.patch
 Patch75:	RHEL-134709-db2-do-not-use-db2stop-to-avoid-divergence-in-the-log.patch
+Patch76:	RHEL-159646-Filesystem-do-not-return-CONFIGURED-during-monitor-action.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aliyun.patch
@@ -371,6 +372,7 @@ exit 1
 %patch -p1 -P 73
 %patch -p1 -P 74
 %patch -p1 -P 75
+%patch -p1 -P 76
 
 # bundled ha-cloud-support libs
 %patch -p1 -P 500
@@ -703,6 +705,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Mon May  4 2026 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-58
+- Filesystem: do not return CONFIGURED during monitor-action
+
+  Resolves: RHEL-159646
+
 * Tue Apr 28 2026 Arslan Ahmad <arahmad@redhat.com> - 4.16.0-57
 - db2: do not use db2stop to avoid divergence in the log