The patch titled
Subject: zram: align zcomp interface to crypto comp API
has been removed from the -mm tree. Its filename was
zram-align-zcomp-interface-to-crypto-comp-api.patch
This patch was dropped because it was folded into zram-switch-to-crypto-compress-api.patch
------------------------------------------------------
From: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Subject: zram: align zcomp interface to crypto comp API
A cosmetic change:
update zcomp interface to be more aligned with the crypto API.
Link: http://lkml.kernel.org/r/20160531122017.2878-4-sergey.senozhatsky@xxxxxxxxx
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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 -puN drivers/block/zram/zcomp.c~zram-align-zcomp-interface-to-crypto-comp-api drivers/block/zram/zcomp.c
--- a/drivers/block/zram/zcomp.c~zram-align-zcomp-interface-to-crypto-comp-api
+++ a/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 *zs
}
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 -puN drivers/block/zram/zcomp.h~zram-align-zcomp-interface-to-crypto-comp-api drivers/block/zram/zcomp.h
--- a/drivers/block/zram/zcomp.h~zram-align-zcomp-interface-to-crypto-comp-api
+++ a/drivers/block/zram/zcomp.h
@@ -49,11 +49,10 @@ struct zcomp_strm *zcomp_stream_get(stru
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 -puN drivers/block/zram/zram_drv.c~zram-align-zcomp-interface-to-crypto-comp-api drivers/block/zram/zram_drv.c
--- a/drivers/block/zram/zram_drv.c~zram-align-zcomp-interface-to-crypto-comp-api
+++ a/drivers/block/zram/zram_drv.c
@@ -563,7 +563,7 @@ static int zram_decompress_page(struct z
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;
_
Patches currently in -mm which might be from sergey.senozhatsky@xxxxxxxxx are
zram-rename-zstrm-find-release-functions.patch
zram-switch-to-crypto-compress-api.patch
zram-use-crypto-api-to-check-alg-availability.patch
zram-cosmetic-cleanup-documentation.patch
zram-delete-custom-lzo-lz4.patch
zram-add-more-compression-algorithms.patch
zram-drop-gfp_t-from-zcomp_strm_alloc.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
