mount-utils: fix warning message of fs mismatch

huww98 · huww98 · commit ed43fc467d94 · 2024-10-24T16:48:51.000+08:00
diff --git a/staging/src/k8s.io/mount-utils/mount_linux.go b/staging/src/k8s.io/mount-utils/mount_linux.go
@@ -631,7 +631,7 @@ func (mounter *SafeFormatAndMount) formatAndMountSensitive(source string, target
 		if fstype != existingFormat {
 			// Verify that the disk is formatted with filesystem type we are expecting
 			mountErrorValue = FilesystemMismatch
-			klog.Warningf("Configured to mount disk %s as %s but current format is %s, things might break", source, existingFormat, fstype)
+			klog.Warningf("Configured to mount disk %s as %s but current format is %s, things might break", source, fstype, existingFormat)
 		}
 
 		if !readOnly {

Original file line number	Diff line number	Diff line change
`@@ -631,7 +631,7 @@ func (mounter *SafeFormatAndMount) formatAndMountSensitive(source string, target`
`631`	`631`	`if fstype != existingFormat {`
`632`	`632`	`// Verify that the disk is formatted with filesystem type we are expecting`
`633`	`633`	`mountErrorValue = FilesystemMismatch`
`634`		`- klog.Warningf("Configured to mount disk %s as %s but current format is %s, things might break", source, existingFormat, fstype)`
	`634`	`+ klog.Warningf("Configured to mount disk %s as %s but current format is %s, things might break", source, fstype, existingFormat)`
`635`	`635`	`}`
`636`	`636`
`637`	`637`	`if !readOnly {`