From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753915AbcEaMUm (ORCPT ); Tue, 31 May 2016 08:20:42 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:35975 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753423AbcEaMUh (ORCPT ); Tue, 31 May 2016 08:20:37 -0400 From: Sergey Senozhatsky To: Minchan Kim Cc: Andrew Morton , Joonsoo Kim , linux-kernel@vger.kernel.org, Sergey Senozhatsky , Sergey Senozhatsky Subject: [PATCH v2 3/8] zram: align zcomp interface to crypto comp API Date: Tue, 31 May 2016 21:20:12 +0900 Message-Id: <20160531122017.2878-4-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.8.3.394.g3916adf In-Reply-To: <20160531122017.2878-1-sergey.senozhatsky@gmail.com> References: <20160531122017.2878-1-sergey.senozhatsky@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A cosmetic change: update zcomp interface to be more aligned with the crypto API. Signed-off-by: Sergey Senozhatsky Cc: Minchan Kim Cc: Joonsoo Kim --- drivers/block/zram/zcomp.c | 5 ++--- drivers/block/zram/zcomp.h | 5 ++--- drivers/block/zram/zram_drv.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c index 241d3c8..f357268 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -103,7 +103,7 @@ void zcomp_stream_put(struct zcomp *comp) } int zcomp_compress(struct zcomp_strm *zstrm, - const unsigned char *src, unsigned int *dst_len) + const void *src, unsigned int *dst_len) { /* * Our dst memory (zstrm->buffer) is always `2 * PAGE_SIZE' sized @@ -127,8 +127,7 @@ int zcomp_compress(struct zcomp_strm *zstrm, } int zcomp_decompress(struct zcomp_strm *zstrm, - const unsigned char *src, - size_t src_len, unsigned char *dst) + const void *src, unsigned int src_len, void *dst) { unsigned int dst_len = PAGE_SIZE; diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h index 5ad1ffe..c914ab7 100644 --- a/drivers/block/zram/zcomp.h +++ b/drivers/block/zram/zcomp.h @@ -49,11 +49,10 @@ struct zcomp_strm *zcomp_stream_get(struct zcomp *comp); void zcomp_stream_put(struct zcomp *comp); int zcomp_compress(struct zcomp_strm *zstrm, - const unsigned char *src, unsigned int *dst_len); + const void *src, unsigned int *dst_len); int zcomp_decompress(struct zcomp_strm *zstrm, - const unsigned char *src, - size_t src_len, unsigned char *dst); + const void *src, unsigned int src_len, void *dst); bool zcomp_set_max_streams(struct zcomp *comp, int num_strm); #endif /* _ZCOMP_H_ */ diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 99c8be7..65d1403 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -563,7 +563,7 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) unsigned char *cmem; struct zram_meta *meta = zram->meta; unsigned long handle; - size_t size; + unsigned int size; bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value); handle = meta->table[index].handle; -- 2.8.3.394.g3916adf