diff --git a/drivers/hyperhold/hp_device.c b/drivers/hyperhold/hp_device.c index 5b818265c26dbba7a0996fc36288489186748faf..47c5dd390477a24e48aecff25e22e3ca897969d1 100644 --- a/drivers/hyperhold/hp_device.c +++ b/drivers/hyperhold/hp_device.c @@ -120,6 +120,8 @@ int soft_crypt_page(struct crypto_skcipher *ctfm, struct page *dst_page, else BUG(); + skcipher_request_free(req); + if (ret) pr_err("%scrypt failed!\n", op == HP_DEV_ENCRYPT ? "en" : "de"); diff --git a/mm/zswapd.c b/mm/zswapd.c index 65d0c102c808900702d0fc0d76c34a4bb373b798..0060849459611b3b319dadfbaa6cfc05f963e796 100644 --- a/mm/zswapd.c +++ b/mm/zswapd.c @@ -87,8 +87,8 @@ u64 swapin_memcg(struct mem_cgroup *memcg, u64 req_size) u64 ratio = atomic64_read(&memcg->memcg_reclaimed.ub_ufs2zram_ratio); struct group_swap_device *gsdev = NULL; - if (req_size > swap_size * ratio / ESWAP_PERCENT_CONSTANT) - req_size = swap_size * ratio / ESWAP_PERCENT_CONSTANT; + if (req_size > div_u64(swap_size * ratio, ESWAP_PERCENT_CONSTANT)) + req_size = div_u64(swap_size * ratio, ESWAP_PERCENT_CONSTANT); down_read(&gs_lock); list_for_each_entry(gsdev, &gs_list, list) { read_size += gsdev->ops->group_read(memcg->id.id, req_size - read_size, @@ -112,8 +112,8 @@ static u64 swapout_memcg(struct mem_cgroup *memcg, u64 req_size) if (all_size * ratio / ESWAP_PERCENT_CONSTANT <= swap_size) return 0; - if (req_size > all_size * ratio / ESWAP_PERCENT_CONSTANT - swap_size) - req_size = all_size * ratio / ESWAP_PERCENT_CONSTANT - swap_size; + if (req_size > div_u64(all_size * ratio, ESWAP_PERCENT_CONSTANT) - swap_size) + req_size = div_u64(all_size * ratio, ESWAP_PERCENT_CONSTANT) - swap_size; down_read(&gs_lock); list_for_each_entry(gsdev, &gs_list, list) { write_size += gsdev->ops->group_write(memcg->id.id, req_size - write_size,