summaryrefslogtreecommitdiffstats
path: root/mm/zswap.c
diff options
context:
space:
mode:
authorYosry Ahmed <yosryahmed@google.com>2024-03-16 02:58:03 +0100
committerAndrew Morton <akpm@linux-foundation.org>2024-04-26 05:55:43 +0200
commit91b71e78b8e478e1a9af36b15ff1d38810572866 (patch)
tree961fbe5545a50cf8fc0af4909ed5ac83f1657945 /mm/zswap.c
parentmm: remove guard around pgd_offset_k() macro (diff)
downloadlinux-91b71e78b8e478e1a9af36b15ff1d38810572866.tar.xz
linux-91b71e78b8e478e1a9af36b15ff1d38810572866.zip
mm: memcg: add NULL check to obj_cgroup_put()
9 out of 16 callers perform a NULL check before calling obj_cgroup_put(). Move the NULL check in the function, similar to mem_cgroup_put(). The unlikely() NULL check in current_objcg_update() was left alone to avoid dropping the unlikey() annotation as this a fast path. Link: https://lkml.kernel.org/r/20240316015803.2777252-1-yosryahmed@google.com Signed-off-by: Yosry Ahmed <yosryahmed@google.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Roman Gushchin <roman.gushchin@linux.dev> Cc: Michal Hocko <mhocko@kernel.org> Cc: Muchun Song <muchun.song@linux.dev> Cc: Shakeel Butt <shakeel.butt@linux.dev> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--mm/zswap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/zswap.c b/mm/zswap.c
index 6f8850c44b61..2817e2791c13 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -1618,8 +1618,7 @@ put_pool:
freepage:
zswap_entry_cache_free(entry);
reject:
- if (objcg)
- obj_cgroup_put(objcg);
+ obj_cgroup_put(objcg);
check_old:
/*
* If the zswap store fails or zswap is disabled, we must invalidate the