Re: [PATCH v2 1/3] dm-pcache: allow built-in build and rename flush helper

[Dongsheng Yang <dongsheng.yang@linux.dev>]

在 11/11/2025 8:13 PM, Li Chen 写道:
> From: Li Chen <chenl311@chinatelecom.cn>
>
> CONFIG_BCACHE is tristate, so dm-pcache can also be built-in.
> Switch the Makefile to use obj-$(CONFIG_DM_PCACHE) so the target can be
> linked into vmlinux instead of always being a loadable module.
>
> Also rename cache_flush() to pcache_cache_flush() to avoid a global
> symbol clash with sunrpc/cache.c's cache_flush().
>
> Signed-off-by: Li Chen <chenl311@chinatelecom.cn>


Reviewed-by： Dongsheng Yang <dongsheng.yang@linux.dev>

> ---
>   drivers/md/dm-pcache/Makefile    | 2 +-
>   drivers/md/dm-pcache/cache.c     | 2 +-
>   drivers/md/dm-pcache/cache.h     | 2 +-
>   drivers/md/dm-pcache/cache_req.c | 6 +++---
>   4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/md/dm-pcache/Makefile b/drivers/md/dm-pcache/Makefile
> index 86776e4acad2..cedfd38854f6 100644
> --- a/drivers/md/dm-pcache/Makefile
> +++ b/drivers/md/dm-pcache/Makefile
> @@ -1,3 +1,3 @@
>   dm-pcache-y := dm_pcache.o cache_dev.o segment.o backing_dev.o cache.o cache_gc.o cache_writeback.o cache_segment.o cache_key.o cache_req.o
>   
> -obj-m += dm-pcache.o
> +obj-$(CONFIG_DM_PCACHE) += dm-pcache.o
> diff --git a/drivers/md/dm-pcache/cache.c b/drivers/md/dm-pcache/cache.c
> index d8e92367d947..d516d4904227 100644
> --- a/drivers/md/dm-pcache/cache.c
> +++ b/drivers/md/dm-pcache/cache.c
> @@ -411,7 +411,7 @@ void pcache_cache_stop(struct dm_pcache *pcache)
>   {
>   	struct pcache_cache *cache = &pcache->cache;
>   
> -	cache_flush(cache);
> +	pcache_cache_flush(cache);
>   
>   	cancel_delayed_work_sync(&cache->gc_work);
>   	flush_work(&cache->clean_work);
> diff --git a/drivers/md/dm-pcache/cache.h b/drivers/md/dm-pcache/cache.h
> index 1136d86958c8..27613b56be54 100644
> --- a/drivers/md/dm-pcache/cache.h
> +++ b/drivers/md/dm-pcache/cache.h
> @@ -339,7 +339,7 @@ void cache_seg_put(struct pcache_cache_segment *cache_seg);
>   void cache_seg_set_next_seg(struct pcache_cache_segment *cache_seg, u32 seg_id);
>   
>   /* cache request*/
> -int cache_flush(struct pcache_cache *cache);
> +int pcache_cache_flush(struct pcache_cache *cache);
>   void miss_read_end_work_fn(struct work_struct *work);
>   int pcache_cache_handle_req(struct pcache_cache *cache, struct pcache_request *pcache_req);
>   
> diff --git a/drivers/md/dm-pcache/cache_req.c b/drivers/md/dm-pcache/cache_req.c
> index 27f94c1fa968..7854a30e07b7 100644
> --- a/drivers/md/dm-pcache/cache_req.c
> +++ b/drivers/md/dm-pcache/cache_req.c
> @@ -790,7 +790,7 @@ static int cache_write(struct pcache_cache *cache, struct pcache_request *pcache
>   }
>   
>   /**
> - * cache_flush - Flush all ksets to persist any pending cache data
> + * pcache_cache_flush - Flush all ksets to persist any pending cache data
>    * @cache: Pointer to the cache structure
>    *
>    * This function iterates through all ksets associated with the provided `cache`
> @@ -802,7 +802,7 @@ static int cache_write(struct pcache_cache *cache, struct pcache_request *pcache
>    * the respective error code, preventing the flush operation from proceeding to
>    * subsequent ksets.
>    */
> -int cache_flush(struct pcache_cache *cache)
> +int pcache_cache_flush(struct pcache_cache *cache)
>   {
>   	struct pcache_cache_kset *kset;
>   	int ret;
> @@ -827,7 +827,7 @@ int pcache_cache_handle_req(struct pcache_cache *cache, struct pcache_request *p
>   	struct bio *bio = pcache_req->bio;
>   
>   	if (unlikely(bio->bi_opf & REQ_PREFLUSH))
> -		return cache_flush(cache);
> +		return pcache_cache_flush(cache);
>   
>   	if (bio_data_dir(bio) == READ)
>   		return cache_read(cache, pcache_req);