Merge pull request #671 from robertbaldyga/cache-vol-flush-no-set-data

Don't attempt to set data for flush/discard on cache volume
This commit is contained in:
Robert Baldyga 2022-03-18 11:29:42 +01:00 committed by GitHub
commit 6d88242e2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -327,14 +327,11 @@ static void ocf_cache_volume_io_complete(struct ocf_io *vol_io, int error)
static int ocf_cache_volume_prepare_vol_io(struct ocf_io *io,
struct ocf_io **vol_io)
{
struct ocf_cache_volume_io_priv *priv;
ocf_cache_t cache;
struct ocf_io *tmp_io;
int result;
OCF_CHECK_NULL(io);
priv = ocf_io_get_priv(io);
cache = ocf_volume_to_cache(ocf_io_get_volume(io));
tmp_io = ocf_volume_new_io(ocf_cache_get_volume(cache), io->io_queue,
@ -342,12 +339,6 @@ static int ocf_cache_volume_prepare_vol_io(struct ocf_io *io,
if (!tmp_io)
return -OCF_ERR_NO_MEM;
result = ocf_io_set_data(tmp_io, priv->data, 0);
if (result) {
ocf_io_put(tmp_io);
return result;
}
*vol_io = tmp_io;
return 0;
@ -377,6 +368,13 @@ static void ocf_cache_volume_submit_io(struct ocf_io *io)
return;
}
result = ocf_io_set_data(vol_io, priv->data, 0);
if (result) {
ocf_io_put(vol_io);
ocf_io_end(io, result);
return;
}
ocf_io_set_cmpl(vol_io, io, NULL, ocf_cache_volume_io_complete);
ocf_volume_submit_io(vol_io);