summaryrefslogtreecommitdiff
path: root/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0008-virtual-media.3-Upd-Use-umount2-.-instead-of-umount.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0008-virtual-media.3-Upd-Use-umount2-.-instead-of-umount.patch')
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0008-virtual-media.3-Upd-Use-umount2-.-instead-of-umount.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0008-virtual-media.3-Upd-Use-umount2-.-instead-of-umount.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0008-virtual-media.3-Upd-Use-umount2-.-instead-of-umount.patch
new file mode 100644
index 0000000000..1695161967
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0008-virtual-media.3-Upd-Use-umount2-.-instead-of-umount.patch
@@ -0,0 +1,37 @@
+From 23c187385db3228bd01520fc0dc7f83cd988e37a Mon Sep 17 00:00:00 2001
+From: Alexandr Ilenko <AIlenko@IBS.RU>
+Date: Mon, 20 Jun 2022 09:56:47 +0300
+Subject: [PATCH 08/20] virtual-media.3: Upd: Use "::umount2(.)" instead of
+ "::umount(.)"
+
+---
+ src/resources.hpp | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/resources.hpp b/src/resources.hpp
+index b211d55..e307955 100644
+--- a/src/resources.hpp
++++ b/src/resources.hpp
+@@ -88,10 +88,17 @@ class Mount
+
+ ~Mount()
+ {
+- if (int result = ::umount(directory->getPath().string().c_str()))
++ if (int result = ::umount2(directory->getPath().string().c_str(), MNT_DETACH))
+ {
+- LogMsg(Logger::Error, result, " : Unable to unmout directory ",
++ LogMsg(Logger::Error, result, " : Unable to lazy unmout directory. Attempt to force umount ",
+ directory->getPath());
++ result = ::umount2(directory->getPath().string().c_str(), MNT_FORCE);
++ if (result)
++ {
++ LogMsg(Logger::Error, result, " : Unable to unmout directory ",
++ directory->getPath().string());
++ return;
++ }
+ }
+ }
+
+--
+2.35.1
+