Align with master changes

include/starpu_helper.h

@@ -194,11 +194,12 @@ int starpu_data_cpy(starpu_data_handle_t dst_handle, starpu_data_handle_t src_ha
    The parameter \p asynchronous indicates whether the function should block
    or not. In the case of an asynchronous call, it is possible to synchronize
    with the termination of this operation either by the means of implicit
-   dependencies (if enabled) or by calling starpu_task_wait_for_all(). If
-   \p callback_func is not <c>NULL</c>, this callback function is executed after
-   the handle has been copied, and it is given the pointer \p
-   callback_arg as argument.
+   dependencies (if enabled) or by calling starpu_task_wait_for_all().
 */
+// If
+//   \p callback_func is not <c>NULL</c>, this callback function is executed after
+//   the handle has been copied, and it is given the pointer \p
+//   callback_arg as argument.
 int starpu_data_dup_ro(starpu_data_handle_t *dst_handle, starpu_data_handle_t src_handle, int asynchronous);
 
 /**

mpi/src/mpi_failure_tolerance/starpu_mpi_checkpoint.c

@@ -179,7 +179,7 @@ int starpu_mpi_submit_checkpoint_template(starpu_mpi_checkpoint_template_t cp_te
 					_starpu_mpi_irecv_cache_aware(*handle, starpu_mpi_data_get_rank(*handle), starpu_mpi_data_get_tag(*handle), MPI_COMM_WORLD, 1, 0,
 					                              NULL, NULL, &_starpu_data_release_cb, (void*)arg->handle, 1, 0, 1);
 					// The callback needs to do nothing. The cached one must release the handle.
-					starpu_data_dup_ro(&arg->copy_handle, arg->handle, 1, NULL, NULL);
+					starpu_data_dup_ro(&arg->copy_handle, arg->handle, 1);
 					starpu_data_acquire_cb(arg->copy_handle, STARPU_R, _starpu_mpi_store_data_and_send_ack_cb, arg);
 					// The callback need to store the data and post ack send.
 				}

mpi/src/mpi_failure_tolerance/starpu_mpi_checkpoint_package.c

@@ -57,7 +57,7 @@ int checkpoint_package_data_del(int cp_id, int cp_inst, int rank)
 			if (checkpoint_data->type==STARPU_R)
 			{
 				starpu_data_handle_t handle = checkpoint_data->ptr;
-				starpu_data_unregister(handle);
+				starpu_data_unregister_submit(handle);
 			}
 			if (checkpoint_data->type==STARPU_VALUE)
 			{