Skip to content

Commit 025f5b8

Browse files
Matthew Wilcox (Oracle)tehcaster
authored andcommitted
slab: Remove folio references from kfree_nolock()
In preparation for splitting struct slab from struct page and struct folio, remove mentions of struct folio from this function. Since large kmalloc objects are not supported here, we can just use virt_to_slab(). Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Link: https://patch.msgid.link/20251113000932.1589073-13-willy@infradead.org Reviewed-by: Harry Yoo <harry.yoo@oracle.com> Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
1 parent 7d26842 commit 025f5b8

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

mm/slub.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6850,21 +6850,19 @@ EXPORT_SYMBOL(kfree);
68506850
*/
68516851
void kfree_nolock(const void *object)
68526852
{
6853-
struct folio *folio;
68546853
struct slab *slab;
68556854
struct kmem_cache *s;
68566855
void *x = (void *)object;
68576856

68586857
if (unlikely(ZERO_OR_NULL_PTR(object)))
68596858
return;
68606859

6861-
folio = virt_to_folio(object);
6862-
if (unlikely(!folio_test_slab(folio))) {
6860+
slab = virt_to_slab(object);
6861+
if (unlikely(!slab)) {
68636862
WARN_ONCE(1, "large_kmalloc is not supported by kfree_nolock()");
68646863
return;
68656864
}
68666865

6867-
slab = folio_slab(folio);
68686866
s = slab->slab_cache;
68696867

68706868
memcg_slab_free_hook(s, slab, &x, 1);

0 commit comments

Comments
 (0)