Skip to content

Commit

Permalink
cleaner: Remove complete_queue
Browse files Browse the repository at this point in the history
Signed-off-by: Robert Baldyga <robert.baldyga@huawei.com>
  • Loading branch information
robertbaldyga committed Jul 12, 2024
1 parent db6b009 commit 1e5eda6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 24 deletions.
3 changes: 0 additions & 3 deletions src/ocf_request.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@ struct ocf_request {
uint8_t part_evict : 1;
/* !< Some cachelines from request's partition must be evicted */

uint8_t complete_queue : 1;
/* !< Request needs to be completed from the queue context */

uint8_t lock_idx : OCF_METADATA_GLOBAL_LOCK_IDX_BITS;
/* !< Selected global metadata read lock */

Expand Down
24 changes: 3 additions & 21 deletions src/utils/utils_cleaner.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ static struct ocf_request *_ocf_cleaner_alloc_master_req(
/* In master, save completion context and function */
req->priv = attribs->cmpl_context;
req->master_io_req = attribs->cmpl_fn;
req->complete_queue = attribs->cmpl_queue;

/* The count of all requests */
env_atomic_set(&req->master_remaining, 1);
Expand Down Expand Up @@ -178,17 +177,6 @@ static void _ocf_cleaner_set_error(struct ocf_request *req)
master->error = -OCF_ERR_IO;
}

static int _ocf_cleaner_complete(struct ocf_request *master)
{
ocf_req_end_t cmpl;

cmpl = master->master_io_req;
cmpl(master->priv, master->error);
ocf_req_put(master);

return 0;
}

static void _ocf_cleaner_complete_req(struct ocf_request *req)
{
struct ocf_request *master = NULL;
Expand All @@ -215,18 +203,12 @@ static void _ocf_cleaner_complete_req(struct ocf_request *req)

OCF_DEBUG_MSG(req->cache, "All cleaning request completed");

if (master->complete_queue) {
ocf_req_get(master);
ocf_engine_push_req_front_cb(master,
_ocf_cleaner_complete, true);
} else {
/* Only master contains completion function and priv */
cmpl = master->master_io_req;
cmpl(master->priv, master->error);
/* Only master contains completion function and priv */
cmpl = master->master_io_req;
cmpl(master->priv, master->error);

/* For additional get on master allocation */
ocf_req_put(master);
}
}

static void _ocf_cleaner_on_resume(struct ocf_request *req)
Expand Down

0 comments on commit 1e5eda6

Please sign in to comment.