Merge pull request #47619 from mtanino/iscsi-remove-redundant-nil-check

Automatic merge from submit-queue (batch tested with PRs 47619, 47951, 46260, 48277) iSCSi plugin: Remove redundant nil check **What this PR does / why we need it**: This patch is for cleanup of redundant nil check in iSCSI plugin. This was mentioned at the code review on origin github thread. https://github.com/openshift/origin/pull/14565 **Which issue this PR fixes** **Special notes for your reviewer**: **Release note**: ``` NONE ```

Merge pull request #47619 from mtanino/iscsi-remove-redundant-nil-check
ad077c4c · Kubernetes Submit Queue · GitHub · 33fc75e2 · 285ac893 · ad077c4c
Commit ad077c4c authored Jun 29, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

iscsi_util.go pkg/volume/iscsi/iscsi_util.go +1 -1

No files found.
--- a/pkg/volume/iscsi/iscsi_util.go
+++ b/pkg/volume/iscsi/iscsi_util.go
@@ -114,7 +114,7 @@ func waitForPathToExistInternal(devicePath *string, maxRetries int, deviceTransp
 			if err == nil {
 				return true
 			}
-			if err != nil && !os.IsNotExist(err) {
+			if !os.IsNotExist(err) {
 				return false
 			}
 			if i == maxRetries-1 {