Skip to content

Commit 0201c05

Browse files
kparasurakpm00
authored andcommitted
mm: zswap: rename zswap_pool_get() to zswap_pool_tryget()
Modify the name of the existing zswap_pool_get() to zswap_pool_tryget() to be representative of the call it makes to percpu_ref_tryget(). A subsequent patch will introduce a new zswap_pool_get() that calls percpu_ref_get(). The intent behind this change is for higher level zswap API such as zswap_store() to call zswap_pool_tryget() to check upfront if the pool's refcount is "0" (which means it could be getting destroyed) and to handle this as an error condition. zswap_store() would proceed only if zswap_pool_tryget() returns success, and any additional pool refcounts that need to be obtained for compressing sub-pages in a large folio could simply call zswap_pool_get(). Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Kanchana P Sridhar <[email protected]> Acked-by: Yosry Ahmed <[email protected]> Reviewed-by: Chengming Zhou <[email protected]> Acked-by: Johannes Weiner <[email protected]> Reviewed-by: Nhat Pham <[email protected]> Cc: "Huang, Ying" <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Ryan Roberts <[email protected]> Cc: Shakeel Butt <[email protected]> Cc: Usama Arif <[email protected]> Cc: Wajdi Feghali <[email protected]> Cc: "Zou, Nanhai" <[email protected]> Cc: Barry Song <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 3d0f560 commit 0201c05

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mm/zswap.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ static void __zswap_pool_empty(struct percpu_ref *ref)
402402
spin_unlock_bh(&zswap_pools_lock);
403403
}
404404

405-
static int __must_check zswap_pool_get(struct zswap_pool *pool)
405+
static int __must_check zswap_pool_tryget(struct zswap_pool *pool)
406406
{
407407
if (!pool)
408408
return 0;
@@ -440,7 +440,7 @@ static struct zswap_pool *zswap_pool_current_get(void)
440440
rcu_read_lock();
441441

442442
pool = __zswap_pool_current();
443-
if (!zswap_pool_get(pool))
443+
if (!zswap_pool_tryget(pool))
444444
pool = NULL;
445445

446446
rcu_read_unlock();
@@ -461,7 +461,7 @@ static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor)
461461
if (strcmp(zpool_get_type(pool->zpool), type))
462462
continue;
463463
/* if we can't get it, it's about to be destroyed */
464-
if (!zswap_pool_get(pool))
464+
if (!zswap_pool_tryget(pool))
465465
continue;
466466
return pool;
467467
}

0 commit comments

Comments
 (0)