From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + zram-cut-trailing-newline-in-algorithm-name.patch added to -mm tree Date: Fri, 22 May 2015 12:45:12 -0700 Message-ID: <555f8748.cihGyR8AMRDWiO2y%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:47083 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757188AbbEVTpN (ORCPT ); Fri, 22 May 2015 15:45:13 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: sergey.senozhatsky.work@gmail.com, minchan@kernel.org, ngupta@vflare.org, sergey.senozhatsky@gmail.com, mm-commits@vger.kernel.org The patch titled Subject: zram: cut trailing newline in algorithm name has been added to the -mm tree. Its filename is zram-cut-trailing-newline-in-algorithm-name.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/zram-cut-trailing-newline-in-algorithm-name.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/zram-cut-trailing-newline-in-algorithm-name.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 Subject: zram: cut trailing newline in algorithm name Supplied sysfs values sometimes contain new-line symbols (echo vs. echo -n), which we also copy as a compression algorithm name. it works fine when we lookup for compression algorithm, because we use sysfs_streq() which takes care of new line symbols. however, it doesn't look nice when we print compression algorithm name if zcomp_create() failed: zram: Cannot initialise LXZ compressing backend cut trailing new-line, so the error string will look like zram: Cannot initialise LXZ compressing backend we also now can replace sysfs_streq() in zcomp_available_show() with strcmp(). Signed-off-by: Sergey Senozhatsky Cc: Minchan Kim Cc: Nitin Gupta Signed-off-by: Andrew Morton --- drivers/block/zram/zcomp.c | 2 +- drivers/block/zram/zram_drv.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff -puN drivers/block/zram/zcomp.c~zram-cut-trailing-newline-in-algorithm-name drivers/block/zram/zcomp.c --- a/drivers/block/zram/zcomp.c~zram-cut-trailing-newline-in-algorithm-name +++ a/drivers/block/zram/zcomp.c @@ -274,7 +274,7 @@ ssize_t zcomp_available_show(const char int i = 0; while (backends[i]) { - if (sysfs_streq(comp, backends[i]->name)) + if (!strcmp(comp, backends[i]->name)) sz += scnprintf(buf + sz, PAGE_SIZE - sz - 2, "[%s] ", backends[i]->name); else diff -puN drivers/block/zram/zram_drv.c~zram-cut-trailing-newline-in-algorithm-name drivers/block/zram/zram_drv.c --- a/drivers/block/zram/zram_drv.c~zram-cut-trailing-newline-in-algorithm-name +++ a/drivers/block/zram/zram_drv.c @@ -363,6 +363,8 @@ static ssize_t comp_algorithm_store(stru struct device_attribute *attr, const char *buf, size_t len) { struct zram *zram = dev_to_zram(dev); + size_t sz; + down_write(&zram->init_lock); if (init_done(zram)) { up_write(&zram->init_lock); @@ -370,6 +372,12 @@ static ssize_t comp_algorithm_store(stru return -EBUSY; } strlcpy(zram->compressor, buf, sizeof(zram->compressor)); + + /* ignore trailing newline */ + sz = strlen(zram->compressor); + if (sz > 0 && zram->compressor[sz - 1] == '\n') + zram->compressor[sz - 1] = 0x00; + up_write(&zram->init_lock); return len; } _ Patches currently in -mm which might be from sergey.senozhatsky.work@gmail.com are zram-remove-obsolete-zram_debug-option.patch zsmalloc-remove-obsolete-zsmalloc_debug.patch zram-cut-trailing-newline-in-algorithm-name.patch linux-next.patch