diff --git a/modules/cas_disk/disk.c b/modules/cas_disk/disk.c index abcfa9b..b8569ed 100644 --- a/modules/cas_disk/disk.c +++ b/modules/cas_disk/disk.c @@ -15,7 +15,6 @@ #define CASDSK_DISK_OPEN_FMODE (FMODE_READ | FMODE_WRITE) static const char * const _casdsk_disk_modes[] = { - [CASDSK_MODE_UNKNOWN] = "unknown", [CASDSK_MODE_ATTACHED] = "attached", }; @@ -131,8 +130,6 @@ struct casdsk_disk *casdsk_disk_open(const char *path, void *private) goto error_kstrdup; } - atomic_set(&dsk->mode, CASDSK_MODE_UNKNOWN); - dsk->bd = open_bdev_exclusive(path, CASDSK_DISK_OPEN_FMODE, dsk); if (IS_ERR(dsk->bd)) { CASDSK_DEBUG_ERROR("Cannot open exclusive"); @@ -222,40 +219,6 @@ void casdsk_disk_close(struct casdsk_disk *dsk) } EXPORT_SYMBOL(casdsk_disk_close); -void __exit casdsk_disk_shutdown_all(void) -{ - struct list_head *item, *n; - struct casdsk_disk *dsk; - - CASDSK_DEBUG_TRACE(); - - mutex_lock(&casdsk_module->lock); - - list_for_each_safe(item, n, &casdsk_module->disk_list) { - dsk = list_entry(item, struct casdsk_disk, list); - - list_del(item); - - casdsk_disk_lock(dsk); - - BUG_ON(!casdsk_disk_is_unknown(dsk)); - - atomic_set(&dsk->mode, CASDSK_MODE_SHUTDOWN); - - if (dsk->exp_obj) { - casdsk_exp_obj_lock(dsk); - casdsk_exp_obj_destroy(dsk); - casdsk_exp_obj_unlock(dsk); - } - - casdsk_disk_unlock(dsk); - __casdsk_disk_close(dsk); - - } - - mutex_unlock(&casdsk_module->lock); -} - struct block_device *casdsk_disk_get_blkdev(struct casdsk_disk *dsk) { BUG_ON(!dsk); diff --git a/modules/cas_disk/disk.h b/modules/cas_disk/disk.h index 2937e77..4c2b658 100644 --- a/modules/cas_disk/disk.h +++ b/modules/cas_disk/disk.h @@ -13,7 +13,6 @@ struct casdsk_exp_obj; -#define CASDSK_MODE_UNKNOWN 0 #define CASDSK_MODE_ATTACHED (1 << 1) #define CASDSK_MODE_SHUTDOWN (1 << 2) @@ -45,8 +44,6 @@ struct casdsk_disk { int __init casdsk_init_disks(void); void casdsk_deinit_disks(void); -void __exit casdsk_disk_shutdown_all(void); - int casdsk_disk_allocate_minors(int count); static inline void casdsk_disk_lock(struct casdsk_disk *dsk) @@ -76,9 +73,4 @@ static inline bool casdsk_disk_is_shutdown(struct casdsk_disk *dsk) CASDSK_MODE_SHUTDOWN; } -static inline bool casdsk_disk_is_unknown(struct casdsk_disk *dsk) -{ - return atomic_read(&dsk->mode) == CASDSK_MODE_UNKNOWN; -} - #endif diff --git a/modules/cas_disk/exp_obj.c b/modules/cas_disk/exp_obj.c index 77b2ece..b59aba7 100644 --- a/modules/cas_disk/exp_obj.c +++ b/modules/cas_disk/exp_obj.c @@ -647,7 +647,6 @@ int casdsk_exp_obj_destroy(struct casdsk_disk *dsk) blk_mq_free_tag_set(&dsk->tag_set); - atomic_set(&dsk->mode, CASDSK_MODE_UNKNOWN); put_disk(exp_obj->gd); return 0; diff --git a/modules/cas_disk/main.c b/modules/cas_disk/main.c index 8711ffa..48ff31b 100644 --- a/modules/cas_disk/main.c +++ b/modules/cas_disk/main.c @@ -1,7 +1,7 @@ /* -* Copyright(c) 2012-2021 Intel Corporation -* SPDX-License-Identifier: BSD-3-Clause -*/ + * Copyright(c) 2012-2022 Intel Corporation + * SPDX-License-Identifier: BSD-3-Clause + */ #include #include @@ -112,7 +112,6 @@ static void __exit casdsk_deinit_kobjects(void) static void __exit casdsk_exit_module(void) { - casdsk_disk_shutdown_all(); casdsk_deinit_disks(); casdsk_deinit_exp_objs(); casdsk_deinit_kobjects();