From: gaurav mahajan <gaurav.mahajan@seagate.com>
Date: Thu, 14 Oct 2021 10:12:38 +0000 (+0300)
Subject: LU-15103 tests: clean up busy cifs mount
X-Git-Tag: 2.14.56~114
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=0f9c30fc32b0558bd62a319cbe78b3883b500987;hp=f5ec52aeebcdd08c07f7318f5f3c5ba9ea3eb05b

LU-15103 tests: clean up busy cifs mount

Busy cifs mount point makes cleanup_cifs fail which
will infact fails lustre unmount as cifs mount point is
lustre mount.

Test-Parameters: trivial
Signed-off-by: gaurav mahajan <gaurav.mahajan@seagate.com>
Signed-off-by: Elena Gryaznova <elena.gryaznova@hpe.com>
HPE-bug-id: LUS-4146
Reviewed-by: Sergey Cheremencev <sergey.cheremencev@hpe.com>
Reviewed-by: Alexander Zarochentsev <alexander.zarochentsev@hpe.com>
Change-Id: I4b7ec7e0a6a706198e328dad337648bf3cb2c3be
Reviewed-on: https://review.whamcloud.com/45238
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/setup-cifs.sh b/lustre/tests/setup-cifs.sh
index 637b33e..9b91e43 100644
--- a/lustre/tests/setup-cifs.sh
+++ b/lustre/tests/setup-cifs.sh
@@ -94,6 +94,6 @@ cleanup_cifs() {
 	local smbclients=${3}
 
 	echo -e "\nUnmounting CIFS clients..."
-	do_nodes $smbclients "umount -f $smbclimntpt" || return 1
+	zconf_umount_clients $smbclients $smbclimntpt -f || return 1
 	do_node $smbsrv "service smb stop"
 }