mempool: rename struct mempool_s to struct mempool

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>
Cc: Christoph Lameter (Ampere) <cl@gentwo.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 95886b404b16b70dbbf95b6085df3ce0c2cb428c..c3f3ec5bb864f96de1d3eab8fac337fe119d0e90 100644 (file)
--- 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 7b151441341b4c2895ebb5005787f3b4e010f53c..34941a4b9026b94811072d9380a9f4404f5def42 100644 (file)
--- 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 185bd8196503d38a83a800b0712d829f494415e6..270ed0822efa713d16a2b7af4d8ccf030beb42c4 100644 (file)
--- 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;
 
 /**