mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #45162 from zhangxiaoyu-zidif/format-err-2
Automatic merge from submit-queue (batch tested with PRs 45285, 45162) mounter.go: format return err. **What this PR does / why we need it**: when an error returned is nil, it's preferred to explicitly return nil. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
This commit is contained in:
commit
f156f7a741
@ -68,7 +68,7 @@ func mountInChroot(rootfsPath string, args []string) error {
|
||||
args = append([]string{rootfsPath, mountCmd}, args...)
|
||||
output, err := exec.Command(chrootCmd, args...).CombinedOutput()
|
||||
if err == nil {
|
||||
return err
|
||||
return nil
|
||||
}
|
||||
|
||||
if !strings.EqualFold(string(output), nfsRPCBindErrMsg) {
|
||||
|
Loading…
Reference in New Issue
Block a user