| From: Christoph Hellwig <hch@lst.de> |
| Subject: mempool: rename struct mempool_s to struct mempool |
| Date: Tue, 12 Aug 2025 10:30:08 +0200 |
| |
| 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. |
| |
| Link: https://lkml.kernel.org/r/20250812083105.371295-1-hch@lst.de |
| Signed-off-by: Christoph Hellwig <hch@lst.de> |
| Reviewed-by: Harry Yoo <harry.yoo@oracle.com> |
| Reviewed-by: Vlastimil Babka <vbabka@suse.cz> |
| Cc: Christoph Lameter (Ampere) <cl@gentwo.org> |
| Cc: David Rientjes <rientjes@google.com> |
| Cc: Roman Gushchin <roman.gushchin@linux.dev> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| include/linux/blkdev.h | 2 +- |
| include/linux/mempool.h | 2 +- |
| include/linux/netfs.h | 2 +- |
| 3 files changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/include/linux/blkdev.h~mempool-rename-struct-mempool_s-to-struct-mempool |
| +++ a/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 */ |
| --- a/include/linux/mempool.h~mempool-rename-struct-mempool_s-to-struct-mempool |
| +++ a/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 */ |
| --- a/include/linux/netfs.h~mempool-rename-struct-mempool_s-to-struct-mempool |
| +++ a/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; |
| |
| /** |
| _ |