From 3102856025899fb51c322af24ea940f02a16d822 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Wed, 24 Aug 2022 14:28:00 +0200 Subject: [PATCH] Remove unused exported symbols from cas_disk Signed-off-by: Robert Baldyga --- modules/cas_cache/cas_cache.h | 14 +--- modules/cas_cache/main.c | 7 -- modules/cas_disk/cas_disk.h | 51 +----------- modules/cas_disk/disk.c | 151 ---------------------------------- modules/cas_disk/exp_obj.c | 1 - 5 files changed, 6 insertions(+), 218 deletions(-) diff --git a/modules/cas_cache/cas_cache.h b/modules/cas_cache/cas_cache.h index 77f50b4..d51d4eb 100644 --- a/modules/cas_cache/cas_cache.h +++ b/modules/cas_cache/cas_cache.h @@ -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 + */ #ifndef __CAS_CACHE_H__ #define __CAS_CACHE_H__ @@ -67,7 +67,6 @@ extern ocf_ctx_t cas_ctx; extern struct casdsk_functions_mapper casdisk_functions; struct casdsk_functions_mapper { - int (*casdsk_disk_detach)(struct casdsk_disk *dsk); int (*casdsk_exp_obj_destroy)(struct casdsk_disk *dsk); int (*casdsk_exp_obj_create)(struct casdsk_disk *dsk, const char *dev_name, struct module *owner, struct casdsk_exp_obj_ops *ops); @@ -79,16 +78,9 @@ struct casdsk_functions_mapper { void (*casdsk_disk_close)(struct casdsk_disk *dsk); struct casdsk_disk *(*casdsk_disk_claim)(const char *path, void *private); int (*casdsk_exp_obj_unlock)(struct casdsk_disk *dsk); - int (*casdsk_disk_set_pt)(struct casdsk_disk *dsk); - struct gendisk *(*casdsk_disk_get_gendisk)(struct casdsk_disk *dsk); - int (*casdsk_disk_attach) (struct casdsk_disk *dsk, struct module *owner, - struct casdsk_exp_obj_ops *ops); - int (*casdsk_disk_set_attached)(struct casdsk_disk *dsk); int (*casdsk_exp_obj_activate)(struct casdsk_disk *dsk); - bool (*casdsk_exp_obj_activated)(struct casdsk_disk *ds); int (*casdsk_exp_obj_lock)(struct casdsk_disk *dsk); struct casdsk_disk *(*casdsk_disk_open)(const char *path, void *private); - int (*casdsk_disk_clear_pt)(struct casdsk_disk *dsk); struct gendisk *(*casdsk_exp_obj_get_gendisk)(struct casdsk_disk *dsk); }; diff --git a/modules/cas_cache/main.c b/modules/cas_cache/main.c index 900ba34..229662f 100644 --- a/modules/cas_cache/main.c +++ b/modules/cas_cache/main.c @@ -82,7 +82,6 @@ int static cas_casdisk_lookup_funtions(void) #ifdef MODULE_MUTEX_SUPPORTED mutex_lock(&module_mutex); #endif - cas_lookup_symbol(casdsk_disk_detach); cas_lookup_symbol(casdsk_exp_obj_destroy); cas_lookup_symbol(casdsk_exp_obj_create); cas_lookup_symbol(casdsk_exp_obj_free); @@ -93,15 +92,9 @@ int static cas_casdisk_lookup_funtions(void) cas_lookup_symbol(casdsk_disk_close); cas_lookup_symbol(casdsk_disk_claim); cas_lookup_symbol(casdsk_exp_obj_unlock); - cas_lookup_symbol(casdsk_disk_set_pt); - cas_lookup_symbol(casdsk_disk_get_gendisk); - cas_lookup_symbol(casdsk_disk_attach); - cas_lookup_symbol(casdsk_disk_set_attached); cas_lookup_symbol(casdsk_exp_obj_activate); - cas_lookup_symbol(casdsk_exp_obj_activated); cas_lookup_symbol(casdsk_exp_obj_lock); cas_lookup_symbol(casdsk_disk_open); - cas_lookup_symbol(casdsk_disk_clear_pt); cas_lookup_symbol(casdsk_exp_obj_get_gendisk); #ifdef MODULE_MUTEX_SUPPORTED mutex_unlock(&module_mutex); diff --git a/modules/cas_disk/cas_disk.h b/modules/cas_disk/cas_disk.h index 624bc06..3d17804 100644 --- a/modules/cas_disk/cas_disk.h +++ b/modules/cas_disk/cas_disk.h @@ -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 + */ #ifndef __CASDISK_H__ #define __CASDISK_H__ @@ -82,44 +82,6 @@ struct request_queue *casdsk_disk_get_queue(struct casdsk_disk *dsk); */ struct gendisk *casdsk_disk_get_gendisk(struct casdsk_disk *dsk); -/** - * @brief Prepare cas_disk device to switch to pass-through mode - * @param dsk Pointer to casdsk_disk structure related to cas_disk device - * @return 0 if success, errno if failure - */ -int casdsk_disk_set_pt(struct casdsk_disk *dsk); - -/** - * @brief Prepare cas_disk device to switch to attached mode - * @param dsk Pointer to casdsk_disk structure related to cas_disk device - * @return 0 if success, errno if failure - */ -int casdsk_disk_set_attached(struct casdsk_disk *dsk); - -/** - * @brief Revert cas_disk device back to attached mode - * @param dsk Pointer to casdsk_disk structure related to cas_disk device - * @return 0 if success, errno if failure - */ -int casdsk_disk_clear_pt(struct casdsk_disk *dsk); - -/** - * @brief Detach cas from cas_disk device - * @param dsk Pointer to casdsk_disk structure related to cas_disk device - * @return 0 if success, errno if failure - */ -int casdsk_disk_detach(struct casdsk_disk *dsk); - -/** - * @brief Attach cas to cas_disk device - * @param dsk Pointer to casdsk_disk structure related to cas_disk device - * @param owner Pointer to cas module - * @param ops Pointer to structure with callback functions - * @return 0 if success, errno if failure - */ -int casdsk_disk_attach(struct casdsk_disk *dsk, struct module *owner, - struct casdsk_exp_obj_ops *ops); - /** * @brief Create exported object (top device) * @param dsk Pointer to casdsk_disk structure related to cas_disk device @@ -153,13 +115,6 @@ struct gendisk *casdsk_exp_obj_get_gendisk(struct casdsk_disk *dsk); */ int casdsk_exp_obj_activate(struct casdsk_disk *dsk); -/** - * @brief Check if exported object is active - * @param dsk Pointer to casdsk_disk structure related to cas_disk device - * @return true if exported object is active - */ -bool casdsk_exp_obj_activated(struct casdsk_disk *dsk); - /** * @brief Lock exported object * @param dsk Pointer to casdsk_disk structure related to cas_disk device diff --git a/modules/cas_disk/disk.c b/modules/cas_disk/disk.c index aef7887..810e9c4 100644 --- a/modules/cas_disk/disk.c +++ b/modules/cas_disk/disk.c @@ -277,7 +277,6 @@ struct gendisk *casdsk_disk_get_gendisk(struct casdsk_disk *dsk) BUG_ON(!dsk->bd); return dsk->bd->bd_disk; } -EXPORT_SYMBOL(casdsk_disk_get_gendisk); struct request_queue *casdsk_disk_get_queue(struct casdsk_disk *dsk) { @@ -300,153 +299,3 @@ int casdsk_disk_allocate_minors(int count) return minor; } - -static inline int __casdsk_disk_set_pt(struct casdsk_disk *dsk) -{ - BUG_ON(!dsk); - atomic_set(&dsk->mode, CASDSK_MODE_TRANS_TO_PT); - casdsk_exp_obj_prepare_pt(dsk); - return 0; -} - -int casdsk_disk_set_pt(struct casdsk_disk *dsk) -{ - int result; - - CASDSK_DEBUG_DISK_TRACE(dsk); - - if (!dsk->exp_obj) - return 0; - - casdsk_disk_lock(dsk); - result = __casdsk_disk_set_pt(dsk); - casdsk_disk_unlock(dsk); - - return result; -} -EXPORT_SYMBOL(casdsk_disk_set_pt); - -static inline int __casdsk_disk_set_attached(struct casdsk_disk *dsk) -{ - atomic_set(&dsk->mode, CASDSK_MODE_TRANS_TO_ATTACHED); - casdsk_exp_obj_prepare_attached(dsk); - - return 0; -} - -int casdsk_disk_set_attached(struct casdsk_disk *dsk) -{ - int result; - - BUG_ON(!dsk); - CASDSK_DEBUG_DISK_TRACE(dsk); - - if (!dsk->exp_obj) - return 0; - - casdsk_disk_lock(dsk); - result = __casdsk_disk_set_attached(dsk); - casdsk_disk_unlock(dsk); - - return result; -} -EXPORT_SYMBOL(casdsk_disk_set_attached); - -static inline int __casdsk_disk_clear_pt(struct casdsk_disk *dsk) -{ - BUG_ON(atomic_read(&dsk->mode) != CASDSK_MODE_TRANS_TO_PT); - atomic_set(&dsk->mode, CASDSK_MODE_ATTACHED); - return 0; -} - -int casdsk_disk_clear_pt(struct casdsk_disk *dsk) -{ - int result; - - BUG_ON(!dsk); - CASDSK_DEBUG_DISK_TRACE(dsk); - - if (!dsk->exp_obj) - return 0; - - casdsk_disk_lock(dsk); - result = __casdsk_disk_clear_pt(dsk); - casdsk_disk_unlock(dsk); - - return result; -} -EXPORT_SYMBOL(casdsk_disk_clear_pt); - -static inline int __casdsk_disk_detach(struct casdsk_disk *dsk) -{ - int result; - - BUG_ON(atomic_read(&dsk->mode) != CASDSK_MODE_TRANS_TO_PT); - - atomic_set(&dsk->mode, CASDSK_MODE_PT); - - result = casdsk_exp_obj_detach(dsk); - if (result) { - atomic_set(&dsk->mode, CASDSK_MODE_ATTACHED); - return result; - } - - return 0; -} - -int casdsk_disk_detach(struct casdsk_disk *dsk) -{ - int result; - - BUG_ON(!dsk); - CASDSK_DEBUG_DISK_TRACE(dsk); - - if (!dsk->exp_obj) - return 0; - - casdsk_disk_lock(dsk); - result = __casdsk_disk_detach(dsk); - casdsk_disk_unlock(dsk); - - return result; - -} -EXPORT_SYMBOL(casdsk_disk_detach); - -static inline int __casdsk_disk_attach(struct casdsk_disk *dsk, - struct module *owner, struct casdsk_exp_obj_ops *ops) -{ - int result; - - BUG_ON(!ops); - BUG_ON(atomic_read(&dsk->mode) != CASDSK_MODE_TRANS_TO_ATTACHED); - - result = casdsk_exp_obj_attach(dsk, owner, ops); - if (result) { - atomic_set(&dsk->mode, CASDSK_MODE_PT); - return result; - } - - atomic_set(&dsk->mode, CASDSK_MODE_ATTACHED); - - return 0; -} - -int casdsk_disk_attach(struct casdsk_disk *dsk, struct module *owner, - struct casdsk_exp_obj_ops *ops) -{ - int result; - - CASDSK_DEBUG_DISK_TRACE(dsk); - - if (!dsk->exp_obj) - return 0; - - casdsk_disk_lock(dsk); - result = __casdsk_disk_attach(dsk, owner, ops); - casdsk_disk_unlock(dsk); - - return result; - -} -EXPORT_SYMBOL(casdsk_disk_attach); diff --git a/modules/cas_disk/exp_obj.c b/modules/cas_disk/exp_obj.c index 13afd37..525a5f3 100644 --- a/modules/cas_disk/exp_obj.c +++ b/modules/cas_disk/exp_obj.c @@ -714,7 +714,6 @@ bool casdsk_exp_obj_activated(struct casdsk_disk *dsk) BUG_ON(!dsk); return dsk->exp_obj->activated; } -EXPORT_SYMBOL(casdsk_exp_obj_activated); int casdsk_exp_obj_lock(struct casdsk_disk *dsk) {