X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/63b1a5c12557bb11505f9dcfcc955f328b51e118..aa9507e1633819259794ea4d6cf391dc88621dac:/lib/mount/fs.go diff --git a/lib/mount/fs.go b/lib/mount/fs.go index c008b96af6..3c2e628d01 100644 --- a/lib/mount/fs.go +++ b/lib/mount/fs.go @@ -5,6 +5,7 @@ package mount import ( + "errors" "io" "log" "os" @@ -121,23 +122,25 @@ func (fs *keepFS) Utimens(path string, tmsp []fuse.Timespec) int { } func (fs *keepFS) errCode(err error) int { - if os.IsNotExist(err) { + if err == nil { + return 0 + } + if errors.Is(err, os.ErrNotExist) { return -fuse.ENOENT } - switch err { - case os.ErrExist: + if errors.Is(err, os.ErrExist) { return -fuse.EEXIST - case arvados.ErrInvalidArgument: + } + if errors.Is(err, arvados.ErrInvalidArgument) { return -fuse.EINVAL - case arvados.ErrInvalidOperation: + } + if errors.Is(err, arvados.ErrInvalidOperation) { return -fuse.ENOSYS - case arvados.ErrDirectoryNotEmpty: + } + if errors.Is(err, arvados.ErrDirectoryNotEmpty) { return -fuse.ENOTEMPTY - case nil: - return 0 - default: - return -fuse.EIO } + return -fuse.EIO } func (fs *keepFS) Mkdir(path string, mode uint32) int {