The patch titled
Subject: zram-check-comp-algorithm-availability-earlier-v2
has been added to the -mm tree. Its filename is
zram-check-comp-algorithm-availability-earlier-v2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/zram-check-comp-algorithm-availability-earlier-v2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/zram-check-comp-algorithm-availability-earlier-v2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Subject: zram-check-comp-algorithm-availability-earlier-v2
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Cc: Marcin Jabrzyk <m.jabrzyk@xxxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Nitin Gupta <ngupta@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zcomp.c | 10 +++++-----
drivers/block/zram/zram_drv.c | 5 +----
2 files changed, 6 insertions(+), 9 deletions(-)
diff -puN drivers/block/zram/zcomp.c~zram-check-comp-algorithm-availability-earlier-v2 drivers/block/zram/zcomp.c
--- a/drivers/block/zram/zcomp.c~zram-check-comp-algorithm-availability-earlier-v2
+++ a/drivers/block/zram/zcomp.c
@@ -286,6 +286,11 @@ ssize_t zcomp_available_show(const char
return sz;
}
+bool zcomp_available_algorithm(const char *comp)
+{
+ return find_backend(comp) != NULL;
+}
+
bool zcomp_set_max_streams(struct zcomp *comp, int num_strm)
{
return comp->set_max_streams(comp, num_strm);
@@ -320,11 +325,6 @@ void zcomp_destroy(struct zcomp *comp)
kfree(comp);
}
-bool zcomp_available_algorithm(const char *comp)
-{
- return find_backend(comp) != NULL;
-}
-
/*
* search available compressors for requested algorithm.
* allocate new zcomp and initialize it. return compressing
diff -puN drivers/block/zram/zram_drv.c~zram-check-comp-algorithm-availability-earlier-v2 drivers/block/zram/zram_drv.c
--- a/drivers/block/zram/zram_drv.c~zram-check-comp-algorithm-availability-earlier-v2
+++ a/drivers/block/zram/zram_drv.c
@@ -378,11 +378,8 @@ static ssize_t comp_algorithm_store(stru
if (sz > 0 && zram->compressor[sz - 1] == '\n')
zram->compressor[sz - 1] = 0x00;
- if (!zcomp_available_algorithm(zram->compressor)) {
- pr_err("Error: unavailable compression algorithm: %s\n",
- zram->compressor);
+ if (!zcomp_available_algorithm(zram->compressor))
len = -EINVAL;
- }
up_write(&zram->init_lock);
return len;
_
Patches currently in -mm which might be from sergey.senozhatsky@xxxxxxxxx are
zram-add-compact-sysfs-entry-to-documentation.patch
zram-cosmetic-zram_attr_ro-code-formatting-tweak.patch
zram-use-idr-instead-of-zram_devices-array.patch
zram-reorganize-code-layout.patch
zram-remove-max_num_devices-limitation.patch
zram-report-every-added-and-removed-device.patch
zram-trivial-correct-flag-operations-comment.patch
zram-return-zram-device_id-from-zram_add.patch
zram-close-race-by-open-overriding.patch
zram-add-dynamic-device-add-remove-functionality.patch
zram-cosmetic-zram_bvec_write-cleanup.patch
zram-cut-trailing-newline-in-algorithm-name.patch
zram-check-comp-algorithm-availability-earlier.patch
zram-check-comp-algorithm-availability-earlier-v2.patch
linux-next.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
