aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_HAL_Linux: Storage: fix writing garbage while creating file

Browse Source 
By the time we create the storage we hadn't still initialized the
buffer. Remove the writes during storage creation since ftruncate() will
take care of the file size aspect and MAX storage write chunk is taken
care by Linux according to the media/fs that is there.
This commit is contained in:
Lucas De Marchi 2018-05-21 14:38:37 -07:00 committed by Lucas De Marchi
parent 5526997d45
commit 1f3b7b5687
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_HAL_Linux/Storage.cpp
View File

@ -117,12 +117,6 @@ void Storage::_storage_create(void)
STORAGE_FILE);
}
for (uint16_t loc=0; loc<sizeof(_buffer); loc += LINUX_STORAGE_MAX_WRITE) {
if (write(fd, &_buffer[loc], LINUX_STORAGE_MAX_WRITE) != LINUX_STORAGE_MAX_WRITE) {
perror("write");
AP_HAL::panic("Error filling " STORAGE_FILE);
}
}
// ensure the directory is updated with the new size
fsync(fd);
close(fd);
@ -135,6 +129,8 @@ void Storage::_storage_open(void)
}
_dirty_mask = 0;
memset(_buffer, 0, sizeof(_buffer));
int fd = open(STORAGE_FILE, O_RDWR|O_CLOEXEC);
if (fd == -1) {
_storage_create();
@ -143,7 +139,7 @@ void Storage::_storage_open(void)
AP_HAL::panic("Failed to open " STORAGE_FILE);
}
}
memset(_buffer, 0, sizeof(_buffer));
/*
we allow a read of size 4096 to cope with the old storage size
without forcing users to reset all parameters