hcq/sysbench
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed unconditional directio() call on Solaris: do it only when --file-extra-flags=direct.

Browse Source
This commit is contained in:
Alexey Kopytov
2015-10-12 17:36:37 +03:00
parent 148b0988a8
commit f7629417d0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sysbench/tests/fileio/sb_fileio.c
View File

@ -965,7 +965,7 @@ const char *get_test_mode_str(file_test_mode_t mode)
static int convert_extra_flags(file_flags_t extra_flags, int *open_flags)
{
switch (file_extra_flags) {
switch (extra_flags) {
case SB_FILE_FLAG_NORMAL:
#ifdef _WIN32
*open_flags = FILE_ATTRIBUTE_NORMAL;
@ -2064,7 +2064,8 @@ static FILE_DESCRIPTOR sb_open(const char *name)
#endif
#ifdef HAVE_DIRECTIO
if (VALID_FILE(file) && directio(file, DIRECTIO_ON))
if (VALID_FILE(file) && file_extra_flags == SB_FILE_FLAG_DIRECTIO &&
directio(file, DIRECTIO_ON))
{
log_errno(LOG_FATAL, "directio() failed");
return SB_INVALID_FILE;