From 5e17d0833f117ca70db073999aaf832a30e1fd20 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Mon, 17 May 2021 16:51:11 +0200 Subject: [PATCH] Remove unused callbacks from cas_disk ops Signed-off-by: Robert Baldyga --- modules/cas_cache/volume/vol_block_dev_top.c | 32 -------------------- modules/cas_disk/cas_disk.h | 32 -------------------- 2 files changed, 64 deletions(-) diff --git a/modules/cas_cache/volume/vol_block_dev_top.c b/modules/cas_cache/volume/vol_block_dev_top.c index 18e5cea..e8d33b1 100644 --- a/modules/cas_cache/volume/vol_block_dev_top.c +++ b/modules/cas_cache/volume/vol_block_dev_top.c @@ -178,36 +178,6 @@ static int _blockdev_set_geometry(struct casdsk_disk *dsk, void *private) return 0; } -static void _blockdev_pending_req_inc(struct casdsk_disk *dsk, void *private) -{ - ocf_core_t core; - ocf_volume_t obj; - struct bd_object *bvol; - - BUG_ON(!private); - core = private; - obj = ocf_core_get_volume(core); - bvol = bd_object(obj); - BUG_ON(!bvol); - - atomic64_inc(&bvol->pending_rqs); -} - -static void _blockdev_pending_req_dec(struct casdsk_disk *dsk, void *private) -{ - ocf_core_t core; - ocf_volume_t obj; - struct bd_object *bvol; - - BUG_ON(!private); - core = private; - obj = ocf_core_get_volume(core); - bvol = bd_object(obj); - BUG_ON(!bvol); - - atomic64_dec(&bvol->pending_rqs); -} - struct defer_bio_context { struct work_struct io_work; void (*cb)(ocf_core_t core, struct bio *bio); @@ -424,8 +394,6 @@ static void _blockdev_submit_bio(struct casdsk_disk *dsk, static struct casdsk_exp_obj_ops _blockdev_exp_obj_ops = { .set_geometry = _blockdev_set_geometry, .submit_bio = _blockdev_submit_bio, - .pending_rq_inc = _blockdev_pending_req_inc, - .pending_rq_dec = _blockdev_pending_req_dec, }; /** diff --git a/modules/cas_disk/cas_disk.h b/modules/cas_disk/cas_disk.h index 17d2b6b..cbc8911 100644 --- a/modules/cas_disk/cas_disk.h +++ b/modules/cas_disk/cas_disk.h @@ -16,21 +16,6 @@ struct casdsk_disk; struct casdsk_exp_obj_ops { - - /** - * @brief Prepare request queue of exported object (top) block device. - * Could be NULL. - */ - int (*prepare_queue)(struct casdsk_disk *dsk, struct request_queue *q, - void *private); - - /** - * @brief Cleanup request queue of exported object (top) block device. - * Could be NULL. - */ - void (*cleanup_queue)(struct casdsk_disk *dsk, struct request_queue *q, - void *private); - /** * @brief Set geometry of exported object (top) block device. * Could be NULL. @@ -44,23 +29,6 @@ struct casdsk_exp_obj_ops { */ void (*submit_bio)(struct casdsk_disk *dsk, struct bio *bio, void *private); - - /** - * @brief Increment exported object pending request counter. - */ - void (*pending_rq_inc)(struct casdsk_disk *dsk, void *private); - - /** - * @brief Decrement exported object pending request counter. - */ - void (*pending_rq_dec)(struct casdsk_disk *dsk, void *private); - - /** - * @brief ioctl handler of exported object (top) block device. - * Called by cas_disk when cas_disk device is in attached mode. - */ - int (*ioctl)(struct casdsk_disk *dsk, unsigned int cmd, unsigned long arg, - void *private); }; /**