From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757927AbcCCOsh (ORCPT ); Thu, 3 Mar 2016 09:48:37 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:33601 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757869AbcCCOsd (ORCPT ); Thu, 3 Mar 2016 09:48:33 -0500 From: Sergey Senozhatsky To: Minchan Kim Cc: Andrew Morton , Joonsoo Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky , Sergey Senozhatsky Subject: [RFC][PATCH v3 4/5] zram: use zs_huge_object() Date: Thu, 3 Mar 2016 23:46:02 +0900 Message-Id: <1457016363-11339-5-git-send-email-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.8.0.rc0 In-Reply-To: <1457016363-11339-1-git-send-email-sergey.senozhatsky@gmail.com> References: <1457016363-11339-1-git-send-email-sergey.senozhatsky@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sergey Senozhatsky zram should stop enforcing its own 'bad' object size watermark, and start using zs_huge_object(). zsmalloc really knows better. Drop `max_zpage_size' and use zs_huge_object() instead. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 2 +- drivers/block/zram/zram_drv.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 46055db..bb81b1b 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -714,7 +714,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, goto out; } src = zstrm->buffer; - if (unlikely(clen > max_zpage_size)) { + if (unlikely(zs_huge_object(clen))) { clen = PAGE_SIZE; if (is_partial_io(bvec)) src = uncmem; diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index 8e92339..8879161 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -23,12 +23,6 @@ /*-- Configurable parameters */ /* - * Pages that compress to size greater than this are stored - * uncompressed in memory. - */ -static const size_t max_zpage_size = PAGE_SIZE / 4 * 3; - -/* * NOTE: max_zpage_size must be less than or equal to: * ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would * always return failure. -- 2.8.0.rc0