File 0001-Filesystem-unmount-bind-mounts-before-unmo... of Package resource-agents.24247

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Filesystem-unmount-bind-mounts-before-unmount-file-s.patch of Package resource-agents.24247

From 7b0ad80a04ee2a6bd30e4e7ca0552f96e979d5e5 Mon Sep 17 00:00:00 2001
From: Gang He <ghe@suse.com>
Date: Mon, 29 Nov 2021 18:32:31 +0800
Subject: [PATCH] Filesystem: unmount bind mounts before unmount file system

When unmount a file system, we should unmount any bind mounts on
this device firstly. Otherwise, the device still has file system
mounts, this may cause the deactivation of the device to fail.
---
 heartbeat/Filesystem | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
index 54d24eef..010c1dcf 100755
--- a/heartbeat/Filesystem
+++ b/heartbeat/Filesystem
@@ -359,6 +359,27 @@ list_submounts() {
 	list_mounts | grep "${TAB}${1}/" | cut -d"$TAB" -f2 | sort -r
 }
 
+# Lists all bind mounts of a given file system,
+# excluding the path itself.
+list_bindmounts() {
+	if is_bind_mount; then
+		# skip bind mount
+		# we should not umount the original file system via a bind mount
+		return
+	fi
+
+	match_string="${TAB}${1}${TAB}"
+	if list_mounts | grep "$match_string" >/dev/null 2>&1; then
+		mount_disk=$(list_mounts | grep "$match_string" | cut -d"$TAB" -f1)
+	else
+		return
+	fi
+
+	if [ -b "$mount_disk" ]; then
+		list_mounts | grep "$mount_disk" | grep -v "$match_string" | cut -d"$TAB" -f2 | sort -r
+	fi
+}
+
 # kernels < 2.6.26 can't handle bind remounts
 bind_kernel_check() {
 	echo "$options" | grep -w ro >/dev/null 2>&1 ||
@@ -696,6 +717,7 @@ Filesystem_stop()
 			fi
 		done <<-EOF
 			$(list_submounts "$CANONICALIZED_MOUNTPOINT"; \
+				list_bindmounts "$CANONICALIZED_MOUNTPOINT"; \
 				echo $CANONICALIZED_MOUNTPOINT)
 			EOF
 	fi
-- 
2.12.3

Places

File 0001-Filesystem-unmount-bind-mounts-before-unmount-file-s.patch of Package resource-agents.24247

Places