From 2c455841eac1edbe415e237b0c4778ea14b50482 Mon Sep 17 00:00:00 2001 From: "j.laycock" Date: Fri, 18 Oct 2019 11:01:45 +0100 Subject: [PATCH] Make volumeCreate more consistent between all 3 implementations. --- weed/storage/volume_create.go | 2 +- weed/storage/volume_create_linux.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/weed/storage/volume_create.go b/weed/storage/volume_create.go index 80bfd104b..65022a60b 100644 --- a/weed/storage/volume_create.go +++ b/weed/storage/volume_create.go @@ -8,7 +8,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/glog" ) -func createVolumeFile(fileName string, preallocate int64, useMemoryMap uint32) (*os.File, error) { +func createVolumeFile(fileName string, preallocate int64, memoryMapSizeMB uint32) (*os.File, error) { file, e := os.OpenFile(fileName, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) if preallocate > 0 { glog.V(0).Infof("Preallocated disk space for %s is not supported", fileName) diff --git a/weed/storage/volume_create_linux.go b/weed/storage/volume_create_linux.go index 0dc7364fa..d9dfc3862 100644 --- a/weed/storage/volume_create_linux.go +++ b/weed/storage/volume_create_linux.go @@ -9,8 +9,8 @@ import ( "github.com/chrislusf/seaweedfs/weed/glog" ) -func createVolumeFile(fileName string, preallocate int64, useMemoryMap uint32) (file *os.File, e error) { - file, e = os.OpenFile(fileName, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) +func createVolumeFile(fileName string, preallocate int64, memoryMapSizeMB uint32) (*os.File, error) { + file, e := os.OpenFile(fileName, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) if preallocate != 0 { syscall.Fallocate(int(file.Fd()), 1, 0, preallocate) glog.V(0).Infof("Preallocated %d bytes disk space for %s", preallocate, fileName)