diff --git a/internal/model/model.go b/internal/model/model.go index 8d38c6f6..41003442 100644 --- a/internal/model/model.go +++ b/internal/model/model.go @@ -1001,7 +1001,7 @@ func (m *Model) ScanFolderSub(folder, sub string) error { Dir: dir, Sub: sub, Ignores: ignores, - BlockSize: scanner.StandardBlockSize, + BlockSize: protocol.BlockSize, TempNamer: defTempNamer, CurrentFiler: cFiler{m, folder}, IgnorePerms: m.folderCfgs[folder].IgnorePerms, diff --git a/internal/model/puller.go b/internal/model/puller.go index d2f3c854..73f1f1d3 100644 --- a/internal/model/puller.go +++ b/internal/model/puller.go @@ -469,7 +469,7 @@ func (p *Puller) shortcutFile(file protocol.FileInfo) { // copierRoutine reads pullerStates until the in channel closes and performs // the relevant copy. func (p *Puller) copierRoutine(in <-chan copyBlocksState, out chan<- *sharedPullerState) { - buf := make([]byte, scanner.StandardBlockSize) + buf := make([]byte, protocol.BlockSize) nextFile: for state := range in { @@ -575,7 +575,7 @@ func (p *Puller) finisherRoutine(in <-chan *sharedPullerState) { l.Warnln("puller: final:", err) continue } - err = scanner.Verify(fd, scanner.StandardBlockSize, state.file.Blocks) + err = scanner.Verify(fd, protocol.BlockSize, state.file.Blocks) fd.Close() if err != nil { os.Remove(state.tempName) diff --git a/internal/scanner/blocks.go b/internal/scanner/blocks.go index de38b223..c247fcaa 100644 --- a/internal/scanner/blocks.go +++ b/internal/scanner/blocks.go @@ -24,8 +24,6 @@ import ( "github.com/syncthing/syncthing/internal/protocol" ) -const StandardBlockSize = 128 * 1024 - var sha256OfNothing = []uint8{0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55} // Blocks returns the blockwise hash of the reader.