From patchwork Fri Jul 19 08:01:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gu Zheng X-Patchwork-Id: 260197 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D8C762C007B for ; Fri, 19 Jul 2013 18:06:23 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V05hE-0000H0-Av; Fri, 19 Jul 2013 08:05:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V05hC-0000R3-Js; Fri, 19 Jul 2013 08:05:46 +0000 Received: from [222.73.24.84] (helo=song.cn.fujitsu.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V05h9-0000QO-PQ for linux-mtd@lists.infradead.org; Fri, 19 Jul 2013 08:05:44 +0000 X-IronPort-AV: E=Sophos;i="4.89,699,1367942400"; d="scan'208";a="7947493" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 19 Jul 2013 16:02:09 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r6J853ls022401; Fri, 19 Jul 2013 16:05:03 +0800 Received: from [10.167.233.218] ([10.167.233.218]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013071916030694-3066878 ; Fri, 19 Jul 2013 16:03:06 +0800 Message-ID: <51E8F258.7020102@cn.fujitsu.com> Date: Fri, 19 Jul 2013 16:01:28 +0800 From: Gu Zheng User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0.1) Gecko/20110930 Thunderbird/7.0.1 MIME-Version: 1.0 To: dwmw2@infradead.org Subject: [PATCH RESEND] fs/jffs2: remove the unused paramters of function jffs2_{compress,decompress} X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/19 16:03:06, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/19 16:03:11, Serialize complete at 2013/07/19 16:03:11 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130719_040544_079465_45D43A01 X-CRM114-Status: GOOD ( 10.57 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [222.73.24.84 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-fsdevel , linux-mtd@lists.infradead.org, linux-kernel X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 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 Remove the unused paramters of function jffs2_{compress,decompress}. Signed-off-by: Gu Zheng --- fs/jffs2/compr.c | 12 ++++++------ fs/jffs2/compr.h | 12 ++++++------ fs/jffs2/gc.c | 2 +- fs/jffs2/read.c | 4 +++- fs/jffs2/write.c | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c index 4849a4c..6fcb426 100644 --- a/fs/jffs2/compr.c +++ b/fs/jffs2/compr.c @@ -145,9 +145,9 @@ static int jffs2_selected_compress(u8 compr, unsigned char *data_in, * jffs2_compress should compress as much as will fit, and should set * *datalen accordingly to show the amount of data which were compressed. */ -uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f, - unsigned char *data_in, unsigned char **cpage_out, - uint32_t *datalen, uint32_t *cdatalen) +uint16_t jffs2_compress(struct jffs2_sb_info *c, unsigned char *data_in, + unsigned char **cpage_out, uint32_t *datalen, + uint32_t *cdatalen) { int ret = JFFS2_COMPR_NONE; int mode, compr_ret; @@ -250,9 +250,9 @@ uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f, return ret; } -int jffs2_decompress(struct jffs2_sb_info *c, struct jffs2_inode_info *f, - uint16_t comprtype, unsigned char *cdata_in, - unsigned char *data_out, uint32_t cdatalen, uint32_t datalen) +int jffs2_decompress(uint16_t comprtype, unsigned char *cdata_in, + unsigned char *data_out, uint32_t cdatalen, + uint32_t datalen) { struct jffs2_compressor *this; int ret; diff --git a/fs/jffs2/compr.h b/fs/jffs2/compr.h index 5e91d57..092089a 100644 --- a/fs/jffs2/compr.h +++ b/fs/jffs2/compr.h @@ -70,13 +70,13 @@ int jffs2_unregister_compressor(struct jffs2_compressor *comp); int jffs2_compressors_init(void); int jffs2_compressors_exit(void); -uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f, - unsigned char *data_in, unsigned char **cpage_out, - uint32_t *datalen, uint32_t *cdatalen); +uint16_t jffs2_compress(struct jffs2_sb_info *c, unsigned char *data_in, + unsigned char **cpage_out, uint32_t *datalen, + uint32_t *cdatalen); -int jffs2_decompress(struct jffs2_sb_info *c, struct jffs2_inode_info *f, - uint16_t comprtype, unsigned char *cdata_in, - unsigned char *data_out, uint32_t cdatalen, uint32_t datalen); +int jffs2_decompress(uint16_t comprtype, unsigned char *cdata_in, + unsigned char *data_out, uint32_t cdatalen, + uint32_t datalen); void jffs2_free_comprbuf(unsigned char *comprbuf, unsigned char *orig); diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c index 5a2dec2..8dc85aa 100644 --- a/fs/jffs2/gc.c +++ b/fs/jffs2/gc.c @@ -1330,7 +1330,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era writebuf = pg_ptr + (offset & (PAGE_CACHE_SIZE -1)); - comprtype = jffs2_compress(c, f, writebuf, &comprbuf, &datalen, &cdatalen); + comprtype = jffs2_compress(c, writebuf, &comprbuf, &datalen, &cdatalen); ri.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK); ri.nodetype = cpu_to_je16(JFFS2_NODETYPE_INODE); diff --git a/fs/jffs2/read.c b/fs/jffs2/read.c index 0b042b1..aed9183 100644 --- a/fs/jffs2/read.c +++ b/fs/jffs2/read.c @@ -132,7 +132,9 @@ int jffs2_read_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, jffs2_dbg(2, "Decompress %d bytes from %p to %d bytes at %p\n", je32_to_cpu(ri->csize), readbuf, je32_to_cpu(ri->dsize), decomprbuf); - ret = jffs2_decompress(c, f, ri->compr | (ri->usercompr << 8), readbuf, decomprbuf, je32_to_cpu(ri->csize), je32_to_cpu(ri->dsize)); + ret = jffs2_decompress(ri->compr | (ri->usercompr << 8), + readbuf, decomprbuf, je32_to_cpu(ri->csize), + je32_to_cpu(ri->dsize)); if (ret) { pr_warn("Error: jffs2_decompress returned %d\n", ret); goto out_decomprbuf; diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c index b634de4..dbc26de 100644 --- a/fs/jffs2/write.c +++ b/fs/jffs2/write.c @@ -369,7 +369,7 @@ int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f, datalen = min_t(uint32_t, writelen, PAGE_CACHE_SIZE - (offset & (PAGE_CACHE_SIZE-1))); cdatalen = min_t(uint32_t, alloclen - sizeof(*ri), datalen); - comprtype = jffs2_compress(c, f, buf, &comprbuf, &datalen, &cdatalen); + comprtype = jffs2_compress(c, buf, &comprbuf, &datalen, &cdatalen); ri->magic = cpu_to_je16(JFFS2_MAGIC_BITMASK); ri->nodetype = cpu_to_je16(JFFS2_NODETYPE_INODE);