Merge remote-tracking branch 'origin/10.1' into 10.2

# Conflicts:
#	storage/innobase/include/os0file.h

Author: vaintroub

storage/innobase/include/os0file.h

@@ -1197,11 +1197,12 @@ to original un-instrumented file I/O APIs */
 # define os_file_read_no_error_handling(type, file, buf, offset, n, o)	\
 	os_file_read_no_error_handling_func(type, file, buf, offset, n, o)
 # define os_file_read_no_error_handling_int_fd(type, file, buf, offset, n) \
-	os_file_read_no_error_handling_func(type, file, buf, offset, n, NULL)
+	os_file_read_no_error_handling_func(type, OS_FILE_FROM_FD(file), buf, offset, n, NULL)
 
 # define os_file_write(type, name, file, buf, offset, n)	\
 	os_file_write_func(type, name, file, buf, offset, n)
-# define os_file_write_int_fd os_file_write_func
+# define os_file_write_int_fd(type, name, file, buf, offset, n)	\
+	os_file_write_func(type, name, OS_FILE_FROM_FD(file), buf, offset, n)
 
 # define os_file_flush(file)	os_file_flush_func(file)
 

storage/xtradb/include/os0file.h

@@ -469,10 +469,10 @@ to original un-instrumented file I/O APIs */
 	os_file_read_no_error_handling_func(file, buf, offset, n)
 # define os_file_read_no_error_handling_int_fd(                         \
 		file, buf, offset, n)                                   \
-	 os_file_read_no_error_handling_func(file, buf, offset, n)
+	 os_file_read_no_error_handling_func(OS_FILE_FROM_FD(file), buf, offset, n)
 
 # define os_file_write_int_fd(name, file, buf, offset, n)               \
-	os_file_write_func(name, file, buf, offset, n)
+	os_file_write_func(name, OS_FILE_FROM_FD(file), buf, offset, n)
 # define os_file_write(name, file, buf, offset, n)			\
 	os_file_write_func(name, file, buf, offset, n)