From 4881e6c0f0422fedadb0ddb085cdaa58feb257b1 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Wed, 24 Aug 2022 21:26:00 +0200 Subject: [PATCH] Remove casdsk_disk mode The mode is no longer needed. Remove remaining dead code. Signed-off-by: Robert Baldyga --- modules/cas_disk/disk.h | 16 ---------------- modules/cas_disk/exp_obj.c | 14 +------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/modules/cas_disk/disk.h b/modules/cas_disk/disk.h index 4c2b658..395bf26 100644 --- a/modules/cas_disk/disk.h +++ b/modules/cas_disk/disk.h @@ -13,12 +13,8 @@ struct casdsk_exp_obj; -#define CASDSK_MODE_ATTACHED (1 << 1) -#define CASDSK_MODE_SHUTDOWN (1 << 2) - struct casdsk_disk { uint32_t id; - atomic_t mode; char *path; struct mutex lock; @@ -61,16 +57,4 @@ static inline struct casdsk_disk *casdsk_kobj_to_disk(struct kobject *kobj) return container_of(kobj, struct casdsk_disk, kobj); } -static inline bool casdsk_disk_is_attached(struct casdsk_disk *dsk) -{ - return (atomic_read(&dsk->mode) & CASDSK_MODE_ATTACHED) == - CASDSK_MODE_ATTACHED; -} - -static inline bool casdsk_disk_is_shutdown(struct casdsk_disk *dsk) -{ - return (atomic_read(&dsk->mode) & CASDSK_MODE_SHUTDOWN) == - CASDSK_MODE_SHUTDOWN; -} - #endif diff --git a/modules/cas_disk/exp_obj.c b/modules/cas_disk/exp_obj.c index b59aba7..37605d0 100644 --- a/modules/cas_disk/exp_obj.c +++ b/modules/cas_disk/exp_obj.c @@ -38,21 +38,10 @@ void casdsk_deinit_exp_objs(void) kmem_cache_destroy(casdsk_module->exp_obj_cache); } -static inline void _casdsk_exp_obj_handle_bio_att(struct casdsk_disk *dsk, - struct bio *bio) -{ - dsk->exp_obj->ops->submit_bio(dsk, bio, dsk->private); -} - static inline void _casdsk_exp_obj_handle_bio(struct casdsk_disk *dsk, struct bio *bio) { - if (likely(casdsk_disk_is_attached(dsk))) - _casdsk_exp_obj_handle_bio_att(dsk, bio); - else if (casdsk_disk_is_shutdown(dsk)) - CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(-EIO)); - else - BUG(); + dsk->exp_obj->ops->submit_bio(dsk, bio, dsk->private); } static MAKE_RQ_RET_TYPE _casdsk_exp_obj_submit_bio(struct bio *bio) @@ -553,7 +542,6 @@ int casdsk_exp_obj_activate(struct casdsk_disk *dsk) kfree(path); dsk->exp_obj->activated = true; - atomic_set(&dsk->mode, CASDSK_MODE_ATTACHED); add_disk(dsk->exp_obj->gd); result = bd_claim_by_disk(dsk->bd, dsk, dsk->exp_obj->gd);