The patch titled
Subject: zram-use-crypto-api-to-check-alg-availability-v3
has been removed from the -mm tree. Its filename was
zram-use-crypto-api-to-check-alg-availability-v3.patch
This patch was dropped because it was folded into zram-use-crypto-api-to-check-alg-availability.patch
------------------------------------------------------
From: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Subject: zram-use-crypto-api-to-check-alg-availability-v3
Link: http://lkml.kernel.org/r/20160604024902.11778-4-sergey.senozhatsky@xxxxxxxxx
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Acked-by: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zcomp.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff -puN drivers/block/zram/zcomp.c~zram-use-crypto-api-to-check-alg-availability-v3 drivers/block/zram/zcomp.c
--- a/drivers/block/zram/zcomp.c~zram-use-crypto-api-to-check-alg-availability-v3
+++ a/drivers/block/zram/zcomp.c
@@ -59,14 +59,20 @@ static struct zcomp_strm *zcomp_strm_all
bool zcomp_available_algorithm(const char *comp)
{
+ int i = 0;
+
+ while (backends[i]) {
+ if (sysfs_streq(comp, backends[i]))
+ return true;
+ i++;
+ }
+
/*
* Crypto does not ignore a trailing new line symbol,
* so make sure you don't supply a string containing
* one.
- * This also means that we keep `backends' array for
- * zcomp_available_show() only and will init a new zram
- * device with any compressing algorithm known to crypto
- * api.
+ * This also means that we permit zcomp initialisation
+ * with any compressing algorithm known to crypto api.
*/
return crypto_has_comp(comp, 0, 0) == 1;
}
@@ -79,9 +85,6 @@ ssize_t zcomp_available_show(const char
int i = 0;
for (; backends[i]; i++) {
- if (!zcomp_available_algorithm(backends[i]))
- continue;
-
if (!strcmp(comp, backends[i])) {
known_algorithm = true;
sz += scnprintf(buf + sz, PAGE_SIZE - sz - 2,
@@ -96,7 +99,7 @@ ssize_t zcomp_available_show(const char
* Out-of-tree module known to crypto api or a missing
* entry in `backends'.
*/
- if (!known_algorithm && zcomp_available_algorithm(comp))
+ if (!known_algorithm && crypto_has_comp(comp, 0, 0) == 1)
sz += scnprintf(buf + sz, PAGE_SIZE - sz - 2,
"[%s] ", comp);
_
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-delete-custom-lzo-lz4-v3.patch
zram-add-more-compression-algorithms.patch
zram-add-more-compression-algorithms-v3.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
