diff options
| author | Johannes Weiner <hannes@cmpxchg.org> | 2024-01-29 20:36:52 -0500 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-02-22 10:24:44 -0800 |
| commit | 36034bf6fcdb1281e3f8db27d68b6516a3aed4c7 (patch) | |
| tree | f30763d40d854c9d6c5e2ad8ca7cf89538cb946f /mm/zswap.c | |
| parent | 5182661a11baeda74a547660b11570f5b5124eaf (diff) | |
| download | linux-36034bf6fcdb1281e3f8db27d68b6516a3aed4c7.tar.gz linux-36034bf6fcdb1281e3f8db27d68b6516a3aed4c7.tar.bz2 linux-36034bf6fcdb1281e3f8db27d68b6516a3aed4c7.zip | |
mm: zswap: function ordering: move entry section out of tree section
The higher-level entry operations modify the tree, so move the entry
API after the tree section.
Link: https://lkml.kernel.org/r/20240130014208.565554-17-hannes@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Nhat Pham <nphamcs@gmail.com>
Cc: Chengming Zhou <zhouchengming@bytedance.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm/zswap.c')
| -rw-r--r-- | mm/zswap.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/mm/zswap.c b/mm/zswap.c index b8834c4fb7db..19d3482fd035 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -849,27 +849,6 @@ void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg) } /********************************* -* zswap entry functions -**********************************/ -static struct kmem_cache *zswap_entry_cache; - -static struct zswap_entry *zswap_entry_cache_alloc(gfp_t gfp, int nid) -{ - struct zswap_entry *entry; - entry = kmem_cache_alloc_node(zswap_entry_cache, gfp, nid); - if (!entry) - return NULL; - entry->refcount = 1; - RB_CLEAR_NODE(&entry->rbnode); - return entry; -} - -static void zswap_entry_cache_free(struct zswap_entry *entry) -{ - kmem_cache_free(zswap_entry_cache, entry); -} - -/********************************* * rbtree functions **********************************/ static struct zswap_entry *zswap_rb_search(struct rb_root *root, pgoff_t offset) @@ -930,6 +909,27 @@ static bool zswap_rb_erase(struct rb_root *root, struct zswap_entry *entry) return false; } +/********************************* +* zswap entry functions +**********************************/ +static struct kmem_cache *zswap_entry_cache; + +static struct zswap_entry *zswap_entry_cache_alloc(gfp_t gfp, int nid) +{ + struct zswap_entry *entry; + entry = kmem_cache_alloc_node(zswap_entry_cache, gfp, nid); + if (!entry) + return NULL; + entry->refcount = 1; + RB_CLEAR_NODE(&entry->rbnode); + return entry; +} + +static void zswap_entry_cache_free(struct zswap_entry *entry) +{ + kmem_cache_free(zswap_entry_cache, entry); +} + static struct zpool *zswap_find_zpool(struct zswap_entry *entry) { int i = 0; |