Remove two FIXMEs left during refactoring

Author: vitalif

internal/buffer_list.go

@@ -15,12 +15,15 @@
 package internal
 
 import (
+	"errors"
 	"fmt"
-	"syscall"
 
 	"github.com/tidwall/btree"
 )
 
+var ErrBufferIsMissing = errors.New("tried to read from a missing buffer")
+var ErrBufferIsLoading = errors.New("tried to read from a loading buffer")
+
 type BufferState int16
 
 var zeroBuf = make([]byte, 1048576)
@@ -663,25 +666,18 @@ func (l *BufferList) GetHoles(offset, size uint64) (holes []Range, loading bool,
 	return
 }
 
-func (l *BufferList) GetData(offset, size uint64, allowHoles bool, returnIds bool) (data [][]byte, ids map[uint64]bool, err error) {
+func (l *BufferList) GetData(offset, size uint64, returnIds bool) (data [][]byte, ids map[uint64]bool, err error) {
 	if returnIds {
 		ids = make(map[uint64]bool)
 	}
 	curOffset := offset
 	endOffset := offset + size
 	l.at.Ascend(curOffset+1, func(end uint64, b *FileBuffer) bool {
 		if b.offset > curOffset {
-			if allowHoles {
-				curEnd := min(endOffset, b.offset)
-				data = appendZero(data, curEnd-curOffset)
-				curOffset = curEnd
-			} else {
-				// hole
-				data = nil
-				// FIXME Use own error codes
-				err = syscall.EIO
-				return false
-			}
+			// hole
+			data = nil
+			err = ErrBufferIsMissing
+			return false
 		}
 		if b.offset >= endOffset {
 			return false
@@ -693,7 +689,7 @@ func (l *BufferList) GetData(offset, size uint64, allowHoles bool, returnIds boo
 		if b.loading {
 			// tried to read a loading buffer
 			data = nil
-			err = syscall.EAGAIN
+			err = ErrBufferIsLoading
 			return false
 		} else if b.zero {
 			data = appendZero(data, curEnd-curOffset)
@@ -704,13 +700,9 @@ func (l *BufferList) GetData(offset, size uint64, allowHoles bool, returnIds boo
 		return curOffset < endOffset
 	})
 	if err == nil && curOffset < endOffset {
-		if allowHoles {
-			data = appendZero(data, endOffset-curOffset)
-		} else {
-			data = nil
-			err = syscall.EIO
-			return
-		}
+		data = nil
+		err = ErrBufferIsMissing
+		return
 	}
 	return
 }

internal/buffer_list_test.go

@@ -36,7 +36,7 @@ func (s *BufferListTest) TestAppend(t *C) {
 	t.Assert(l.Add(0, filledBuf(1024, 1), BUF_DIRTY, true), Equals, int64(1024))
 	t.Assert(l.Add(1024, filledBuf(1024, 2), BUF_DIRTY, true), Equals, int64(1024))
 	t.Assert(l.Add(1536, filledBuf(1024, 3), BUF_DIRTY, true), Equals, int64(1024))
-	data, _, err := l.GetData(0, 2048, false, true)
+	data, _, err := l.GetData(0, 2048, true)
 	t.Assert(err, IsNil)
 	t.Assert(len(data), Equals, 1)
 	t.Assert(len(data[0]), Equals, 2048)
@@ -51,7 +51,7 @@ func (s *BufferListTest) TestGetHoles(t *C) {
 	}
 	t.Assert(l.Add(0, make([]byte, 1024), BUF_DIRTY, false), Equals, int64(1024))
 	t.Assert(l.Add(1024, make([]byte, 1024), BUF_DIRTY, false), Equals, int64(1024))
-	data, ids, err := l.GetData(0, 2048, false, true)
+	data, ids, err := l.GetData(0, 2048, true)
 	t.Assert(err, IsNil)
 	t.Assert(len(data), Equals, 2)
 	t.Assert(len(data[0]), Equals, 1024)

internal/file.go

@@ -349,11 +349,11 @@ func (inode *Inode) LoadRange(offset, size uint64, readAheadSize uint64, ignoreM
 	// Wait for the data to load
 	if len(readRanges) > 0 || loading {
 		for {
-			_, _, err := inode.buffers.GetData(offset, size, false, false)
-			if err == syscall.EAGAIN {
+			_, _, err := inode.buffers.GetData(offset, size, false)
+			if err == ErrBufferIsLoading {
 				// still loading
 				inode.readCond.Wait()
-			} else if err == syscall.EIO {
+			} else if err == ErrBufferIsMissing {
 				// loading buffer disappeared => read error
 				err = inode.readError
 				if err == nil {
@@ -607,7 +607,7 @@ func (fh *FileHandle) ReadFile(sOffset int64, sLen int64) (data [][]byte, bytesR
 	}
 
 	// return cached buffers directly without copying
-	data, _, err = fh.inode.buffers.GetData(offset, size, false, false)
+	data, _, err = fh.inode.buffers.GetData(offset, size, false)
 	if err != nil && requestErr != nil {
 		return nil, 0, requestErr
 	} else if err != nil {
@@ -643,8 +643,7 @@ func (fh *FileHandle) Release() {
 func (inode *Inode) getMultiReader(offset, size uint64) (reader *MultiReader, ids map[uint64]bool, err error) {
 	inode.buffers.SplitAt(offset)
 	inode.buffers.SplitAt(offset+size)
-	// FIXME: Do not allow holes here too
-	data, ids, err := inode.buffers.GetData(offset, size, true, true)
+	data, ids, err := inode.buffers.GetData(offset, size, true)
 	if err != nil {
 		return nil, nil, err
 	}