Skip to content

GitLab

Unverified Commit b7f7d8cd authored by Daniel Hiltgen's avatar Daniel Hiltgen Committed by GitHub
Browse files

Merge pull request #6291 from dhiltgen/no_sparse_fail 

Don't hard fail on sparse setup error
parents 71b0945f 2fa1db43
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
server/download.go
View file @ b7f7d8cd
...@@ -216,9 +216,7 @@ func (b *blobDownload) run(ctx context.Context, requestURL *url.URL, opts *regis ...@@ -216,9 +216,7 @@ func (b *blobDownload) run(ctx context.Context, requestURL *url.URL, opts *regis
return err return err
} }
defer file.Close() defer file.Close()
if err := setSparse(file); err != nil { setSparse(file)
return err
}
_ = file.Truncate(b.Total) _ = file.Truncate(b.Total)
......
server/sparse_common.go
View file @ b7f7d8cd
...@@ -4,6 +4,5 @@ package server ...@@ -4,6 +4,5 @@ package server
import "os" import "os"
func setSparse(file *os.File) error { func setSparse(*os.File) {
return nil
} }
server/sparse_windows.go
View file @ b7f7d8cd
...@@ -6,8 +6,9 @@ import ( ...@@ -6,8 +6,9 @@ import (
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
) )
func setSparse(file *os.File) error { func setSparse(file *os.File) {
return windows.DeviceIoControl( // exFat (and other FS types) don't support sparse files, so ignore errors
windows.DeviceIoControl( //nolint:errcheck
windows.Handle(file.Fd()), windows.FSCTL_SET_SPARSE, windows.Handle(file.Fd()), windows.FSCTL_SET_SPARSE,
nil, 0, nil, 0,
nil, 0, nil, 0,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment