From: Vitaliy Kuznetsov <vkuznetsov@ddn.com>
Date: Fri, 10 Nov 2023 20:09:42 +0000 (+0100)
Subject: LU-16827 obdfilter: Fix "emfperf obdfilter-survey" error
X-Git-Tag: 2.15.60~87
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6b514c0bd0e3f83cfb9f547148b6fc183db7c4c9;p=fs%2Flustre-release.git

LU-16827 obdfilter: Fix "emfperf obdfilter-survey" error

This patch fixes the definition of the lctl variable. It changes
the logic so that the LCTL value is assigned only when it was
defined earlier.

Fixes: 91a3b286ba ("LU-16827 obdfilter: Fix obdfilter-survery/1a")
Test-Parameters: trivial testlist=obdfilter-survey
Signed-off-by: Vitaliy Kuznetsov <vkuznetsov@ddn.com>
Change-Id: I4dfd7e3d1f78208b33b897d8e6680e59b690014c
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53083
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre-iokit/obdfilter-survey/obdfilter-survey b/lustre-iokit/obdfilter-survey/obdfilter-survey
index 60143fb..9170ef8 100755
--- a/lustre-iokit/obdfilter-survey/obdfilter-survey
+++ b/lustre-iokit/obdfilter-survey/obdfilter-survey
@@ -338,7 +338,7 @@ if [ "$lustre_root" == " " ]; then
 fi
 
 if [ -z "$lustre_root" ]; then
-	lctl=$LCTL
+	lctl=${LCTL:-lctl}
 else
 	lctl=${lustre_root}/utils/lctl
 fi