Merge branch 'master' into 2871-preload-objects

[arvados.git] / services / keep / src / keep / volume_unix.go

diff --git a/services/keep/src/keep/volume_unix.go b/services/keep/src/keep/volume_unix.go
index 88410def8e6d55b5af68226a134708362e8d973f..7b711d2eac1e7c6f5024cc49f723dc31c6c86952 100644 (file)
--- a/services/keep/src/keep/volume_unix.go
+++ b/services/keep/src/keep/volume_unix.go
@@ -109,23 +109,13 @@ func (v *UnixVolume) Put(loc string, block []byte) error {
 // corrupted data block.
 //
 func (v *UnixVolume) Read(loc string) ([]byte, error) {
-       var f *os.File
-       var err error
-       var buf []byte
-
        blockFilename := filepath.Join(v.root, loc[0:3], loc)
-
-       f, err = os.Open(blockFilename)
+       buf, err := ioutil.ReadFile(blockFilename)
        if err != nil {
-               return nil, err
-       }
-
-       if buf, err = ioutil.ReadAll(f); err != nil {
                log.Printf("%s: reading %s: %s\n", v, blockFilename, err)
-               return buf, err
+               return nil, err
        }
 
-       // Success!
        return buf, nil
 }