From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757059Ab2CYUil (ORCPT ); Sun, 25 Mar 2012 16:38:41 -0400 Received: from static.78-46-68-141.clients.your-server.de ([78.46.68.141]:51453 "HELO eristoteles.iwoars.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with SMTP id S1756999Ab2CYUij (ORCPT ); Sun, 25 Mar 2012 16:38:39 -0400 Date: Sun, 25 Mar 2012 22:38:34 +0200 (CEST) From: Joel Reardon X-X-Sender: joel@eristoteles.iwoars.net To: Artem Bityutskiy cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: Re: [patch] Move CRC computation to separate function In-Reply-To: <1332521515.22278.2.camel@sauron.fi.intel.com> Message-ID: References: <1330531826.3545.128.camel@sauron.fi.intel.com> <1332511796.18717.72.camel@sauron.fi.intel.com> <1332521515.22278.2.camel@sauron.fi.intel.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CRC computation now an inline header function which will be used in multiple places in the future. -- Signed-off-by: Joel Reardon fs/ubifs/io.c | 4 +--- fs/ubifs/misc.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index 9228950..103532e 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c @@ -379,7 +379,6 @@ static unsigned long long next_sqnum(struct ubifs_info *c) */ void ubifs_prepare_node(struct ubifs_info *c, void *node, int len, int pad) { - uint32_t crc; struct ubifs_ch *ch = node; unsigned long long sqnum = next_sqnum(c); @@ -390,8 +389,7 @@ void ubifs_prepare_node(struct ubifs_info *c, void *node, int len, int pad) ch->group_type = UBIFS_NO_NODE_GROUP; ch->sqnum = cpu_to_le64(sqnum); ch->padding[0] = ch->padding[1] = 0; - crc = crc32(UBIFS_CRC32_INIT, node + 8, len - 8); - ch->crc = cpu_to_le32(crc); + ubifs_set_node_crc(node); if (pad) { len = ALIGN(len, 8); diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h index ee7cb5e..ffda6a5 100644 --- a/fs/ubifs/misc.h +++ b/fs/ubifs/misc.h @@ -27,6 +27,9 @@ #ifndef __UBIFS_MISC_H__ #define __UBIFS_MISC_H__ +#include +#include "ubifs-media.h" + /** * ubifs_zn_dirty - check if znode is dirty. * @znode: znode to check @@ -300,4 +303,16 @@ static inline int ubifs_next_log_lnum(const struct ubifs_info *c, int lnum) return lnum; } +/** + * ubifs_set_crc - computes and writes the crc for a ubifs node to the common + * header. + * @node: the data node + */ +static inline void ubifs_set_node_crc(void *node) +{ + struct ubifs_ch *ch = (struct ubifs_ch *) node; + int len = le32_to_cpu(ch->len); + ch->crc = cpu_to_le32(crc32(UBIFS_CRC32_INIT, node + 8, len - 8)); +} + #endif /* __UBIFS_MISC_H__ */ -- 1.7.1