Merge branch 'master' into 7478-anm-spot-instances

[arvados.git] / sdk / go / arvados / fs_filehandle.go

diff --git a/sdk/go/arvados/fs_filehandle.go b/sdk/go/arvados/fs_filehandle.go
index d5865317fb77c28bdba096bac3640e881ad74aba..9af8d0ad405828b0c8e9906575cb1b77752eaa63 100644 (file)
--- a/sdk/go/arvados/fs_filehandle.go
+++ b/sdk/go/arvados/fs_filehandle.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package arvados
 
 import (
@@ -74,10 +78,14 @@ func (f *filehandle) Readdir(count int) ([]os.FileInfo, error) {
                return nil, ErrInvalidOperation
        }
        if count <= 0 {
-               return f.inode.Readdir(), nil
+               return f.inode.Readdir()
        }
        if f.unreaddirs == nil {
-               f.unreaddirs = f.inode.Readdir()
+               var err error
+               f.unreaddirs, err = f.inode.Readdir()
+               if err != nil {
+                       return nil, err
+               }
        }
        if len(f.unreaddirs) == 0 {
                return nil, io.EOF