diff options
| author | j.laycock <joseph.laycock@4sightimaging.com> | 2019-09-03 17:00:59 +0100 |
|---|---|---|
| committer | j.laycock <joseph.laycock@4sightimaging.com> | 2019-09-03 17:00:59 +0100 |
| commit | 1f01eb78e81454c54569d8c7baaca115982a87c2 (patch) | |
| tree | 93718397d25eef7bc6f22136deb091f195a2c6f5 /weed/storage/volume_super_block.go | |
| parent | d637d86d22f6f4033d931dd59aa86233521246a4 (diff) | |
| download | seaweedfs-1f01eb78e81454c54569d8c7baaca115982a87c2.tar.xz seaweedfs-1f01eb78e81454c54569d8c7baaca115982a87c2.zip | |
Rename mem_map to mMap, remove some in_memory variables being passed around, added MemoryMapped member to volume struct
Diffstat (limited to 'weed/storage/volume_super_block.go')
| -rw-r--r-- | weed/storage/volume_super_block.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/weed/storage/volume_super_block.go b/weed/storage/volume_super_block.go index 8829909c1..936648f44 100644 --- a/weed/storage/volume_super_block.go +++ b/weed/storage/volume_super_block.go @@ -73,11 +73,11 @@ func (s *SuperBlock) Bytes() []byte { func (v *Volume) maybeWriteSuperBlock() error { - mem_map, exists := memory_map.FileMemoryMap[v.dataFile.Name()] + mMap, exists := memory_map.FileMemoryMap[v.dataFile.Name()] if exists { - if mem_map.End_Of_File == -1 { + if mMap.End_Of_File == -1 { v.SuperBlock.version = needle.CurrentVersion - mem_map.WriteMemory(0, uint64(len(v.SuperBlock.Bytes())), v.SuperBlock.Bytes()) + mMap.WriteMemory(0, uint64(len(v.SuperBlock.Bytes())), v.SuperBlock.Bytes()) } return nil } else { @@ -111,9 +111,9 @@ func (v *Volume) readSuperBlock() (err error) { func ReadSuperBlock(dataFile *os.File) (superBlock SuperBlock, err error) { header := make([]byte, _SuperBlockSize) - mem_map, exists := memory_map.FileMemoryMap[dataFile.Name()] + mMap, exists := memory_map.FileMemoryMap[dataFile.Name()] if exists { - mem_buffer, e := mem_map.ReadMemory(0, _SuperBlockSize) + mem_buffer, e := mMap.ReadMemory(0, _SuperBlockSize) if err != nil { err = fmt.Errorf("cannot read volume %s super block: %v", dataFile.Name(), e) return |