github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #32097 from brendandburns/dev 

Automatic merge from submit-queue

Don't return an error if a file doesn't exist for IsPathDevice(...)

Fixes https://github.com/kubernetes/kubernetes/issues/30455

@saad-ali @thockin fyi, since linux devices and storage.
pull/6/head
Kubernetes Submit Queue 2016-09-09 01:37:40 -07:00 committed by GitHub
parent 08b6eaff92 07c8f9a173
commit dceb33d120
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/util/mount/mount_linux.go
View File

@ -208,6 +208,9 @@ func exclusiveOpenFailsOnDevice(pathname string) (bool, error) {
func pathIsDevice(pathname string) (bool, error) { func pathIsDevice(pathname string) (bool, error) {
finfo, err := os.Stat(pathname) finfo, err := os.Stat(pathname)
if os.IsNotExist(err) {
return false, nil
}
// err in call to os.Stat // err in call to os.Stat
if err != nil { if err != nil {
return false, err return false, err