github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45162 from zhangxiaoyu-zidif/format-err-2

Browse Source 
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:
Kubernetes Submit Queue 2017-05-04 02:15:48 -07:00 committed by GitHub
commit f156f7a741
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/gci/mounter/mounter.go
View File

@ -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) {