Update arguments of nsexec.Execute

Longhorn 7672 Signed-off-by: Derek Su <[email protected]>
longhorn · Feb 19, 2024 · ee35de6 · ee35de6
1 parent 08d3935
commit ee35de6
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/iscsi/initiator.go b/iscsi/initiator.go
@@ -36,7 +36,7 @@ func CheckForInitiatorExistence(nsexec *lhns.Executor) error {
 	opts := []string{
 		"--version",
 	}
-	_, err := nsexec.Execute(iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
+	_, err := nsexec.Execute(nil, iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
 	return err
 }
 
@@ -53,7 +53,7 @@ func UpdateIscsiDeviceAbortTimeout(target string, timeout int64, nsexec *lhns.Ex
 		"-n", "node.session.err_timeo.abort_timeout",
 		"-v", strconv.FormatInt(timeout, 10),
 	}
-	_, err := nsexec.Execute(iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
+	_, err := nsexec.Execute(nil, iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
 	return err
 }
 
@@ -63,7 +63,7 @@ func DiscoverTarget(ip, target string, nsexec *lhns.Executor) error {
 		"-t", "sendtargets",
 		"-p", ip,
 	}
-	output, err := nsexec.Execute(iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
+	output, err := nsexec.Execute(nil, iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
 	if err != nil {
 		return err
 	}
@@ -91,7 +91,7 @@ func DeleteDiscoveredTarget(ip, target string, nsexec *lhns.Executor) error {
 	if ip != "" {
 		opts = append(opts, "-p", ip)
 	}
-	_, err := nsexec.Execute(iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
+	_, err := nsexec.Execute(nil, iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
 	return err
 }
 
@@ -103,7 +103,7 @@ func IsTargetDiscovered(ip, target string, nsexec *lhns.Executor) bool {
 	if ip != "" {
 		opts = append(opts, "-p", ip)
 	}
-	_, err := nsexec.Execute(iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
+	_, err := nsexec.Execute(nil, iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
 	return err == nil
 }
 
@@ -114,7 +114,7 @@ func LoginTarget(ip, target string, nsexec *lhns.Executor) error {
 		"-p", ip,
 		"--login",
 	}
-	_, err := nsexec.Execute(iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
+	_, err := nsexec.Execute(nil, iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
 	if err != nil {
 		return err
 	}
@@ -146,7 +146,7 @@ func LogoutTarget(ip, target string, nsexec *lhns.Executor) error {
 	if ip != "" {
 		opts = append(opts, "-p", ip)
 	}
-	_, err := nsexec.Execute(iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
+	_, err := nsexec.Execute(nil, iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
 	return err
 }
 
@@ -173,7 +173,7 @@ func IsTargetLoggedIn(ip, target string, nsexec *lhns.Executor) bool {
 		"-m", "session",
 	}
 
-	output, err := nsexec.Execute(iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
+	output, err := nsexec.Execute(nil, iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
 	if err != nil {
 		return false
 	}
@@ -205,7 +205,7 @@ func manualScanSession(ip, target string, nsexec *lhns.Executor) error {
 		"-p", ip,
 		"--rescan",
 	}
-	_, err := nsexec.Execute(iscsiBinary, opts, ScanTimeout)
+	_, err := nsexec.Execute(nil, iscsiBinary, opts, ScanTimeout)
 	return err
 }
 
@@ -216,7 +216,7 @@ func getIscsiNodeSessionScanMode(ip, target string, nsexec *lhns.Executor) (stri
 		"-p", ip,
 		"-o", "show",
 	}
-	output, err := nsexec.Execute(iscsiBinary, opts, ScanTimeout)
+	output, err := nsexec.Execute(nil, iscsiBinary, opts, ScanTimeout)
 	if err != nil {
 		return "", err
 	}
@@ -233,7 +233,7 @@ func findScsiDevice(ip, target string, lun int, nsexec *lhns.Executor) (*lhtypes
 		"-m", "session",
 		"-P", "3",
 	}
-	output, err := nsexec.Execute(iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
+	output, err := nsexec.Execute(nil, iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
 	if err != nil {
 		return nil, err
 	}
@@ -362,6 +362,6 @@ func RescanTarget(ip, target string, nsexec *lhns.Executor) error {
 	if ip != "" {
 		opts = append(opts, "-p", ip)
 	}
-	_, err := nsexec.Execute(iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
+	_, err := nsexec.Execute(nil, iscsiBinary, opts, lhtypes.ExecuteDefaultTimeout)
 	return err
 }