diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt
index f2af02c2366..ebb138c70f0 100644
--- a/storage/columnstore/CMakeLists.txt
+++ b/storage/columnstore/CMakeLists.txt
@@ -5,6 +5,10 @@ if("NO" STREQUAL "${PLUGIN_COLUMNSTORE}")
 endif()
 
 add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
+IF(NOT PLUGIN_PERFSCHEMA STREQUAL NO)
+  add_definitions(-DHAVE_PSI_INTERFACE=)
+ENDIF()
+
 
 # this does everything, gets the var from the correct scope, appends new
 # values, sets in the correct scope
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index f37e239fc8b..ab7ed7ab061 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -1290,13 +1290,13 @@ os_file_create_func(
 
 #if (defined(UNIV_SOLARIS) && defined(DIRECTIO_ON)) || defined O_DIRECT
 	if (type == OS_DATA_FILE) {
+# ifdef __linux__
+use_o_direct:
+# endif
 		switch (srv_file_flush_method) {
 		case SRV_O_DSYNC:
 		case SRV_O_DIRECT:
 		case SRV_O_DIRECT_NO_FSYNC:
-# ifdef __linux__
-use_o_direct:
-# endif
 			os_file_set_nocache(file, name, mode_str);
 			break;
 		default:
@@ -1349,9 +1349,7 @@ use_o_direct:
 				goto skip_o_direct;
 			}
 			log_sys.set_block_size(uint32_t(s));
-			if (srv_file_flush_method == SRV_O_DSYNC) {
-				goto use_o_direct;
-			}
+			goto use_o_direct;
 		} else {
 skip_o_direct:
 			log_sys.set_block_size(0);