mempool: rename struct mempool_s to struct mempool

[PATCH] mempool: rename struct mempool_s to struct mempool

Posted by Christoph Hellwig 1 month, 3 weeks ago

Drop the pointless _s prefix and align to the usual struct naming to
prepare for actually using the struct instead of the typedef so that
random headers don't need to include mempool.h for just having a
pointer to the mempool.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/linux/blkdev.h  | 2 +-
 include/linux/mempool.h | 2 +-
 include/linux/netfs.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 95886b404b16..c3f3ec5bb864 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -199,7 +199,7 @@ struct gendisk {
 	unsigned int		zone_wplugs_hash_bits;
 	atomic_t		nr_zone_wplugs;
 	spinlock_t		zone_wplugs_lock;
-	struct mempool_s	*zone_wplugs_pool;
+	struct mempool		*zone_wplugs_pool;
 	struct hlist_head	*zone_wplugs_hash;
 	struct workqueue_struct *zone_wplugs_wq;
 #endif /* CONFIG_BLK_DEV_ZONED */
diff --git a/include/linux/mempool.h b/include/linux/mempool.h
index 7b151441341b..34941a4b9026 100644
--- a/include/linux/mempool.h
+++ b/include/linux/mempool.h
@@ -15,7 +15,7 @@ struct kmem_cache;
 typedef void * (mempool_alloc_t)(gfp_t gfp_mask, void *pool_data);
 typedef void (mempool_free_t)(void *element, void *pool_data);
 
-typedef struct mempool_s {
+typedef struct mempool {
 	spinlock_t lock;
 	int min_nr;		/* nr of elements at *elements */
 	int curr_nr;		/* Current nr of elements at *elements */
diff --git a/include/linux/netfs.h b/include/linux/netfs.h
index 185bd8196503..270ed0822efa 100644
--- a/include/linux/netfs.h
+++ b/include/linux/netfs.h
@@ -21,7 +21,7 @@
 #include <linux/rolling_buffer.h>
 
 enum netfs_sreq_ref_trace;
-typedef struct mempool_s mempool_t;
+typedef struct mempool mempool_t;
 struct folio_queue;
 
 /**
-- 
2.47.2

Re: [PATCH] mempool: rename struct mempool_s to struct mempool

Posted by Vlastimil Babka 1 month, 1 week ago

On 8/12/25 10:30, Christoph Hellwig wrote:
> Drop the pointless _s prefix and align to the usual struct naming to
> prepare for actually using the struct instead of the typedef so that
> random headers don't need to include mempool.h for just having a
> pointer to the mempool.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Reviewed-by: Vlastimil Babka <vbabka@suse.cz>

> ---
>  include/linux/blkdev.h  | 2 +-
>  include/linux/mempool.h | 2 +-
>  include/linux/netfs.h   | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index 95886b404b16..c3f3ec5bb864 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -199,7 +199,7 @@ struct gendisk {
>  	unsigned int		zone_wplugs_hash_bits;
>  	atomic_t		nr_zone_wplugs;
>  	spinlock_t		zone_wplugs_lock;
> -	struct mempool_s	*zone_wplugs_pool;
> +	struct mempool		*zone_wplugs_pool;
>  	struct hlist_head	*zone_wplugs_hash;
>  	struct workqueue_struct *zone_wplugs_wq;
>  #endif /* CONFIG_BLK_DEV_ZONED */
> diff --git a/include/linux/mempool.h b/include/linux/mempool.h
> index 7b151441341b..34941a4b9026 100644
> --- a/include/linux/mempool.h
> +++ b/include/linux/mempool.h
> @@ -15,7 +15,7 @@ struct kmem_cache;
>  typedef void * (mempool_alloc_t)(gfp_t gfp_mask, void *pool_data);
>  typedef void (mempool_free_t)(void *element, void *pool_data);
>  
> -typedef struct mempool_s {
> +typedef struct mempool {
>  	spinlock_t lock;
>  	int min_nr;		/* nr of elements at *elements */
>  	int curr_nr;		/* Current nr of elements at *elements */
> diff --git a/include/linux/netfs.h b/include/linux/netfs.h
> index 185bd8196503..270ed0822efa 100644
> --- a/include/linux/netfs.h
> +++ b/include/linux/netfs.h
> @@ -21,7 +21,7 @@
>  #include <linux/rolling_buffer.h>
>  
>  enum netfs_sreq_ref_trace;
> -typedef struct mempool_s mempool_t;
> +typedef struct mempool mempool_t;
>  struct folio_queue;
>  
>  /**

Re: [PATCH] mempool: rename struct mempool_s to struct mempool

Posted by Harry Yoo 1 month, 3 weeks ago

On Tue, Aug 12, 2025 at 10:30:08AM +0200, Christoph Hellwig wrote:
> Drop the pointless _s prefix and align to the usual struct naming to
> prepare for actually using the struct instead of the typedef so that
> random headers don't need to include mempool.h for just having a
> pointer to the mempool.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---

Reviewed-by: Harry Yoo <harry.yoo@oracle.com>

-- 
Cheers,
Harry / Hyeonggon

>  include/linux/blkdev.h  | 2 +-
>  include/linux/mempool.h | 2 +-
>  include/linux/netfs.h   | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index 95886b404b16..c3f3ec5bb864 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -199,7 +199,7 @@ struct gendisk {
>  	unsigned int		zone_wplugs_hash_bits;
>  	atomic_t		nr_zone_wplugs;
>  	spinlock_t		zone_wplugs_lock;
> -	struct mempool_s	*zone_wplugs_pool;
> +	struct mempool		*zone_wplugs_pool;
>  	struct hlist_head	*zone_wplugs_hash;
>  	struct workqueue_struct *zone_wplugs_wq;
>  #endif /* CONFIG_BLK_DEV_ZONED */
> diff --git a/include/linux/mempool.h b/include/linux/mempool.h
> index 7b151441341b..34941a4b9026 100644
> --- a/include/linux/mempool.h
> +++ b/include/linux/mempool.h
> @@ -15,7 +15,7 @@ struct kmem_cache;
>  typedef void * (mempool_alloc_t)(gfp_t gfp_mask, void *pool_data);
>  typedef void (mempool_free_t)(void *element, void *pool_data);
>  
> -typedef struct mempool_s {
> +typedef struct mempool {
>  	spinlock_t lock;
>  	int min_nr;		/* nr of elements at *elements */
>  	int curr_nr;		/* Current nr of elements at *elements */
> diff --git a/include/linux/netfs.h b/include/linux/netfs.h
> index 185bd8196503..270ed0822efa 100644
> --- a/include/linux/netfs.h
> +++ b/include/linux/netfs.h
> @@ -21,7 +21,7 @@
>  #include <linux/rolling_buffer.h>
>  
>  enum netfs_sreq_ref_trace;
> -typedef struct mempool_s mempool_t;
> +typedef struct mempool mempool_t;
>  struct folio_queue;
>  
>  /**
> -- 
> 2.47.2
>