Rename "data object" to "volume"
Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
This commit is contained in:
@@ -48,7 +48,7 @@ int ocf_io_d2c(struct ocf_request *req)
|
||||
/* Get OCF request - increase reference counter */
|
||||
ocf_req_get(req);
|
||||
|
||||
ocf_submit_obj_req(&core->obj, req, _ocf_d2c_completion);
|
||||
ocf_submit_volume_req(&core->volume, req, _ocf_d2c_completion);
|
||||
|
||||
ocf_engine_update_block_stats(req);
|
||||
|
||||
|
@@ -65,7 +65,7 @@ static int _ocf_discard_core(struct ocf_request *req)
|
||||
struct ocf_cache *cache = req->cache;
|
||||
struct ocf_io *io;
|
||||
|
||||
io = ocf_dobj_new_io(&cache->core[req->core_id].obj);
|
||||
io = ocf_volume_new_io(&cache->core[req->core_id].volume);
|
||||
if (!io) {
|
||||
_ocf_discard_complete_req(req, -ENOMEM);
|
||||
return -ENOMEM;
|
||||
@@ -79,7 +79,7 @@ static int _ocf_discard_core(struct ocf_request *req)
|
||||
ocf_io_set_data(io, req->data, 0);
|
||||
ocf_io_set_queue(io, req->io_queue);
|
||||
|
||||
ocf_dobj_submit_discard(io);
|
||||
ocf_volume_submit_discard(io);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -105,7 +105,7 @@ static int _ocf_discard_flush_cache(struct ocf_request *req)
|
||||
{
|
||||
struct ocf_io *io;
|
||||
|
||||
io = ocf_dobj_new_io(&req->cache->device->obj);
|
||||
io = ocf_volume_new_io(&req->cache->device->volume);
|
||||
if (!io) {
|
||||
ocf_metadata_error(req->cache);
|
||||
_ocf_discard_complete_req(req, -ENOMEM);
|
||||
@@ -116,7 +116,7 @@ static int _ocf_discard_flush_cache(struct ocf_request *req)
|
||||
ocf_io_set_cmpl(io, req, NULL, _ocf_discard_cache_flush_complete);
|
||||
ocf_io_set_queue(io, req->io_queue);
|
||||
|
||||
ocf_dobj_submit_flush(io);
|
||||
ocf_volume_submit_flush(io);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@@ -50,7 +50,7 @@ static int _ocf_invalidate_do(struct ocf_request *req)
|
||||
|
||||
env_atomic_inc(&req->req_remaining);
|
||||
|
||||
if (ocf_dobj_is_atomic(&cache->device->obj) &&
|
||||
if (ocf_volume_is_atomic(&cache->device->volume) &&
|
||||
req->info.flush_metadata) {
|
||||
/* Metadata flush IO */
|
||||
ocf_metadata_flush_do_asynch(cache, req, _ocf_invalidate_req);
|
||||
|
@@ -48,7 +48,7 @@ int ocf_engine_ops(struct ocf_request *req)
|
||||
env_atomic_set(&req->req_remaining, 2);
|
||||
|
||||
/* Submit operation into core device */
|
||||
ocf_submit_obj_req(&cache->core[req->core_id].obj, req,
|
||||
ocf_submit_volume_req(&cache->core[req->core_id].volume, req,
|
||||
_ocf_engine_ops_complete);
|
||||
|
||||
ocf_submit_cache_reqs(cache, req->map, req, req->rw,
|
||||
|
@@ -50,7 +50,7 @@ static inline void _ocf_read_pt_submit(struct ocf_request *req)
|
||||
OCF_DEBUG_RQ(req, "Submit");
|
||||
|
||||
/* Core read */
|
||||
ocf_submit_obj_req(&cache->core[req->core_id].obj, req,
|
||||
ocf_submit_volume_req(&cache->core[req->core_id].volume, req,
|
||||
_ocf_read_pt_complete);
|
||||
}
|
||||
|
||||
|
@@ -128,7 +128,7 @@ static inline void _ocf_read_generic_submit_miss(struct ocf_request *req)
|
||||
goto err_alloc;
|
||||
|
||||
/* Submit read request to core device. */
|
||||
ocf_submit_obj_req(&cache->core[req->core_id].obj, req,
|
||||
ocf_submit_volume_req(&cache->core[req->core_id].volume, req,
|
||||
_ocf_read_generic_miss_complete);
|
||||
|
||||
return;
|
||||
|
@@ -72,7 +72,7 @@ int ocf_write_wa(struct ocf_request *req)
|
||||
|
||||
/* Submit write IO to the core */
|
||||
env_atomic_set(&req->req_remaining, 1);
|
||||
ocf_submit_obj_req(&cache->core[req->core_id].obj, req,
|
||||
ocf_submit_volume_req(&cache->core[req->core_id].volume, req,
|
||||
_ocf_read_wa_complete);
|
||||
|
||||
/* Update statistics */
|
||||
|
@@ -111,7 +111,7 @@ static int _ocf_write_wi_do(struct ocf_request *req)
|
||||
OCF_DEBUG_RQ(req, "Submit");
|
||||
|
||||
/* Submit write IO to the core */
|
||||
ocf_submit_obj_req(&cache->core[req->core_id].obj, req,
|
||||
ocf_submit_volume_req(&cache->core[req->core_id].volume, req,
|
||||
_ocf_write_wi_core_complete);
|
||||
|
||||
/* Update statistics */
|
||||
|
@@ -93,7 +93,7 @@ static inline void _ocf_write_wt_submit(struct ocf_request *req)
|
||||
ocf_engine_io_count(req), _ocf_write_wt_cache_complete);
|
||||
|
||||
/* To core */
|
||||
ocf_submit_obj_req(&cache->core[req->core_id].obj, req,
|
||||
ocf_submit_volume_req(&cache->core[req->core_id].volume, req,
|
||||
_ocf_write_wt_core_complete);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user