From 2d9104895ba86eea855cbe1a989b4ec56d0c4173 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Thu, 27 Feb 2020 13:35:51 +1100 Subject: [PATCH] LU-12511 fld: remove unused functions from fld_cache.c fld_cache_delete and fld_cache_entry_lookup{,nolock} are never used, so they can be removed. fld_cache_entry_delete is only used locally to fld_cache.c so it can be made static. Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: Ied370420c348c95e14897187daaaec6708b5c96a Reviewed-on: https://review.whamcloud.com/37737 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Reviewed-by: Shaun Tancheff --- lustre/fld/fld_cache.c | 54 ++--------------------------------------------- lustre/fld/fld_internal.h | 13 ------------ 2 files changed, 2 insertions(+), 65 deletions(-) diff --git a/lustre/fld/fld_cache.c b/lustre/fld/fld_cache.c index 482fd10..c2e59f3 100644 --- a/lustre/fld/fld_cache.c +++ b/lustre/fld/fld_cache.c @@ -101,8 +101,8 @@ void fld_cache_fini(struct fld_cache *cache) /** * delete given node from list. */ -void fld_cache_entry_delete(struct fld_cache *cache, - struct fld_cache_entry *node) +static void fld_cache_entry_delete(struct fld_cache *cache, + struct fld_cache_entry *node) { list_del(&node->fce_list); list_del(&node->fce_lru); @@ -455,56 +455,6 @@ void fld_cache_delete_nolock(struct fld_cache *cache, } /** - * Delete FLD entry in FLD cache. - * - */ -void fld_cache_delete(struct fld_cache *cache, - const struct lu_seq_range *range) -{ - write_lock(&cache->fci_lock); - fld_cache_delete_nolock(cache, range); - write_unlock(&cache->fci_lock); -} - -struct fld_cache_entry * -fld_cache_entry_lookup_nolock(struct fld_cache *cache, - const struct lu_seq_range *range) -{ - struct fld_cache_entry *flde; - struct fld_cache_entry *got = NULL; - struct list_head *head; - - head = &cache->fci_entries_head; - list_for_each_entry(flde, head, fce_list) { - if (range->lsr_start == flde->fce_range.lsr_start || - (range->lsr_end == flde->fce_range.lsr_end && - range->lsr_flags == flde->fce_range.lsr_flags)) { - got = flde; - break; - } - } - - RETURN(got); -} - -/** - * lookup \a seq sequence for range in fld cache. - */ -struct fld_cache_entry * -fld_cache_entry_lookup(struct fld_cache *cache, - const struct lu_seq_range *range) -{ - struct fld_cache_entry *got = NULL; - ENTRY; - - read_lock(&cache->fci_lock); - got = fld_cache_entry_lookup_nolock(cache, range); - read_unlock(&cache->fci_lock); - - RETURN(got); -} - -/** * lookup \a seq sequence for range in fld cache. */ int fld_cache_lookup(struct fld_cache *cache, diff --git a/lustre/fld/fld_internal.h b/lustre/fld/fld_internal.h index e326edd..1230b17 100644 --- a/lustre/fld/fld_internal.h +++ b/lustre/fld/fld_internal.h @@ -197,24 +197,11 @@ struct fld_cache_entry int fld_cache_insert_nolock(struct fld_cache *cache, struct fld_cache_entry *f_new); -void fld_cache_delete(struct fld_cache *cache, - const struct lu_seq_range *range); void fld_cache_delete_nolock(struct fld_cache *cache, const struct lu_seq_range *range); int fld_cache_lookup(struct fld_cache *cache, const u64 seq, struct lu_seq_range *range); -struct fld_cache_entry * -fld_cache_entry_lookup(struct fld_cache *cache, - const struct lu_seq_range *range); - -void fld_cache_entry_delete(struct fld_cache *cache, - struct fld_cache_entry *node); - -struct fld_cache_entry * -fld_cache_entry_lookup_nolock(struct fld_cache *cache, - const struct lu_seq_range *range); - static inline const char * fld_target_name(const struct lu_fld_target *tar) { -- 1.8.3.1