From 9fe2c306099b3fbb959efa09c95be7c0953de46c Mon Sep 17 00:00:00 2001
From: astraw99 <wangchengiscool@gmail.com>
Date: Sun, 19 Sep 2021 18:44:31 +0800
Subject: [PATCH] fix nil merge map

---
 pkg/volume/csi/csi_mounter.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/volume/csi/csi_mounter.go b/pkg/volume/csi/csi_mounter.go
index 98a60ebcb06..bb31acc7d9f 100644
--- a/pkg/volume/csi/csi_mounter.go
+++ b/pkg/volume/csi/csi_mounter.go
@@ -474,7 +474,7 @@ func makeVolumeHandle(podUID, volSourceSpecName string) string {
 }
 
 func mergeMap(first, second map[string]string) map[string]string {
-	if first == nil && second != nil {
+	if first == nil {
 		return second
 	}
 	for k, v := range second {