Skip to content

Commit 4f174a8

Browse files
Xiongwei Songtehcaster
authored andcommitted
slub: Remove slabs_node() function
When traversing nodes one by one, the get_node() function called in for_each_kmem_cache_node macro, no need to call get_node() again in slabs_node(), just reading nr_slabs field should be enough. However, the node_nr_slabs() function can do this. Hence, the slabs_node() function is not needed anymore. Signed-off-by: Xiongwei Song <xiongwei.song@windriver.com> Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
1 parent c6c17c4 commit 4f174a8

1 file changed

Lines changed: 3 additions & 13 deletions

File tree

mm/slub.c

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,14 +1344,6 @@ static void remove_full(struct kmem_cache *s, struct kmem_cache_node *n, struct
13441344
list_del(&slab->slab_list);
13451345
}
13461346

1347-
/* Tracking of the number of slabs for debugging purposes */
1348-
static inline unsigned long slabs_node(struct kmem_cache *s, int node)
1349-
{
1350-
struct kmem_cache_node *n = get_node(s, node);
1351-
1352-
return atomic_long_read(&n->nr_slabs);
1353-
}
1354-
13551347
static inline unsigned long node_nr_slabs(struct kmem_cache_node *n)
13561348
{
13571349
return atomic_long_read(&n->nr_slabs);
@@ -1722,8 +1714,6 @@ slab_flags_t kmem_cache_flags(unsigned int object_size,
17221714

17231715
#define disable_higher_order_debug 0
17241716

1725-
static inline unsigned long slabs_node(struct kmem_cache *s, int node)
1726-
{ return 0; }
17271717
static inline unsigned long node_nr_slabs(struct kmem_cache_node *n)
17281718
{ return 0; }
17291719
static inline void inc_slabs_node(struct kmem_cache *s, int node,
@@ -4598,7 +4588,7 @@ bool __kmem_cache_empty(struct kmem_cache *s)
45984588
struct kmem_cache_node *n;
45994589

46004590
for_each_kmem_cache_node(s, node, n)
4601-
if (n->nr_partial || slabs_node(s, node))
4591+
if (n->nr_partial || node_nr_slabs(n))
46024592
return false;
46034593
return true;
46044594
}
@@ -4615,7 +4605,7 @@ int __kmem_cache_shutdown(struct kmem_cache *s)
46154605
/* Attempt to free all objects */
46164606
for_each_kmem_cache_node(s, node, n) {
46174607
free_partial(s, n);
4618-
if (n->nr_partial || slabs_node(s, node))
4608+
if (n->nr_partial || node_nr_slabs(n))
46194609
return 1;
46204610
}
46214611
return 0;
@@ -4828,7 +4818,7 @@ static int __kmem_cache_do_shrink(struct kmem_cache *s)
48284818
list_for_each_entry_safe(slab, t, &discard, slab_list)
48294819
free_slab(s, slab);
48304820

4831-
if (slabs_node(s, node))
4821+
if (node_nr_slabs(n))
48324822
ret = 1;
48334823
}
48344824

0 commit comments

Comments
 (0)