Merge pull request #8046 from heyitsanthony/fix-falloc-0

fileutil: return immediately if preallocating 0 bytes
This commit is contained in:
Anthony Romano 2017-06-07 11:55:27 -07:00 committed by GitHub
commit 29911195de
2 changed files with 9 additions and 0 deletions

View File

@ -127,6 +127,11 @@ func TestZeroToEnd(t *testing.T) {
}
defer f.Close()
// Ensure 0 size is a nop so zero-to-end on an empty file won't give EINVAL.
if err = ZeroToEnd(f); err != nil {
t.Fatal(err)
}
b := make([]byte, 1024)
for i := range b {
b[i] = 12

View File

@ -25,6 +25,10 @@ import (
// If the operation is unsupported, no error will be returned.
// Otherwise, the error encountered will be returned.
func Preallocate(f *os.File, sizeInBytes int64, extendFile bool) error {
if sizeInBytes == 0 {
// fallocate will return EINVAL if length is 0; skip
return nil
}
if extendFile {
return preallocExtend(f, sizeInBytes)
}