From patchwork Thu Jun 17 08:59:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Lei X-Patchwork-Id: 1493271 X-Patchwork-Delegate: richard@nod.at Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=wfYDlaJE; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G5GGS0TT5z9s1l for ; Thu, 17 Jun 2021 19:00:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=SZuKhm93Y/PYR4KzBXBfzzIb+sjXRN5yhhwktA4CB7Y=; b=wfYDlaJEALNOLU iMWOyGQLNABow2KI81lvFuIab/No+QkMhBLmOISZCmFGiq98l69O62IfjCWCjp/4g559YYfAkcvCz CvxNDcoTpbBUw4vVxJcFf3Mwx08c3gLUY00n2ssDT/v59Xd84rDh89kV1HFSfJiHmSR5/61mTHuJx cgtWuL1JNM4VLgCg6pzyvhAuCpJFh/4o4VDhr2TrRphEiESZ5cidfn9Z95uUk/fPk+goeMno7RvxM I6aFsUxAfCMhhEJIpfOZUbw5+MJK9NEddWNVOhIsRCTvcJkbivcrjcY913ZHqZitgZUmpldeVqQU6 /zRIZkzQk7cjOOFaCaoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltnro-009ZUx-CB; Thu, 17 Jun 2021 08:59:16 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltnrk-009ZTP-DH for linux-mtd@lists.infradead.org; Thu, 17 Jun 2021 08:59:14 +0000 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4G5G7f3qFfzXfMq; Thu, 17 Jun 2021 16:54:06 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Thu, 17 Jun 2021 16:59:09 +0800 Received: from thunder-town.china.huawei.com (10.174.179.0) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Thu, 17 Jun 2021 16:59:08 +0800 From: Zhen Lei To: David Woodhouse , Richard Weinberger , linux-mtd , linux-kernel CC: Zhen Lei Subject: [PATCH 1/1] jffs2: remove unnecessary oom message Date: Thu, 17 Jun 2021 16:59:05 +0800 Message-ID: <20210617085905.1385-1-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.174.179.0] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210617_015912_668139_7EE71624 X-CRM114-Status: GOOD ( 11.00 ) X-Spam-Score: -2.3 (--) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Fixes scripts/checkpatch.pl warning: WARNING: Possible unnecessary 'out of memory' message Remove it can help us save a bit of memory. Signed-off-by: Zhen Lei --- fs/jffs2/compr.c | 16 +++++ fs/jffs2/dir.c | 1 - 2 files changed, 5 insertions(+), 12 deletions(-) Content analysis details: (-2.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [45.249.212.187 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [45.249.212.187 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Fixes scripts/checkpatch.pl warning: WARNING: Possible unnecessary 'out of memory' message Remove it can help us save a bit of memory. Signed-off-by: Zhen Lei --- fs/jffs2/compr.c | 16 +++++----------- fs/jffs2/dir.c | 1 - 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c index 4849a4c9a0e2..700a2de39b08 100644 --- a/fs/jffs2/compr.c +++ b/fs/jffs2/compr.c @@ -80,10 +80,8 @@ static int jffs2_selected_compress(u8 compr, unsigned char *data_in, char *output_buf; output_buf = kmalloc(*cdatalen, GFP_KERNEL); - if (!output_buf) { - pr_warn("No memory for compressor allocation. Compression failed.\n"); + if (!output_buf) return ret; - } orig_slen = *datalen; orig_dlen = *cdatalen; spin_lock(&jffs2_compressor_list_lock); @@ -189,15 +187,11 @@ uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f, spin_unlock(&jffs2_compressor_list_lock); tmp_buf = kmalloc(orig_slen, GFP_KERNEL); spin_lock(&jffs2_compressor_list_lock); - if (!tmp_buf) { - pr_warn("No memory for compressor allocation. (%d bytes)\n", - orig_slen); + if (!tmp_buf) continue; - } - else { - this->compr_buf = tmp_buf; - this->compr_buf_size = orig_slen; - } + + this->compr_buf = tmp_buf; + this->compr_buf_size = orig_slen; } this->usecount++; spin_unlock(&jffs2_compressor_list_lock); diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index c0aabbcbfd58..a2f643dd1923 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c @@ -353,7 +353,6 @@ static int jffs2_symlink (struct user_namespace *mnt_userns, struct inode *dir_i /* We use f->target field to store the target path. */ f->target = kmemdup(target, targetlen + 1, GFP_KERNEL); if (!f->target) { - pr_warn("Can't allocate %d bytes of memory\n", targetlen + 1); mutex_unlock(&f->sem); jffs2_complete_reservation(c); ret = -ENOMEM;