Commit 0288d5fe authored by Xichao Zhao's avatar Xichao Zhao Committed by Richard Weinberger
Browse files

ubifs: Simplify the code using ubifs_crc_node 



Replace part of the code using ubifs_crc_node.

Signed-off-by: default avatarXichao Zhao <zhao.xichao@vivo.com>
Reviewed-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent e3577061

fs/ubifs/io.c

+2 −7
Original line number Diff line number Diff line
@@ -327,8 +327,6 @@ int ubifs_check_node(const struct ubifs_info *c, const void *buf, int len, 
 */

void ubifs_pad(const struct ubifs_info *c, void *buf, int pad)

{

	uint32_t crc;



	ubifs_assert(c, pad >= 0);



	if (pad >= UBIFS_PAD_NODE_SZ) {
@@ -343,8 +341,7 @@ void ubifs_pad(const struct ubifs_info *c, void *buf, int pad) 
		ch->len = cpu_to_le32(UBIFS_PAD_NODE_SZ);

		pad -= UBIFS_PAD_NODE_SZ;

		pad_node->pad_len = cpu_to_le32(pad);

		crc = crc32(UBIFS_CRC32_INIT, buf + 8, UBIFS_PAD_NODE_SZ - 8);

		ch->crc = cpu_to_le32(crc);

		ubifs_crc_node(buf, UBIFS_PAD_NODE_SZ);

		memset(buf + UBIFS_PAD_NODE_SZ, 0, pad);

	} else if (pad > 0)

		/* Too little space, padding node won't fit */
@@ -469,7 +466,6 @@ void ubifs_prepare_node(struct ubifs_info *c, void *node, int len, int pad) 
 */

void ubifs_prep_grp_node(struct ubifs_info *c, void *node, int len, int last)

{

	uint32_t crc;

	struct ubifs_ch *ch = node;

	unsigned long long sqnum = next_sqnum(c);
@@ -483,8 +479,7 @@ void ubifs_prep_grp_node(struct ubifs_info *c, void *node, int len, int last) 
		ch->group_type = UBIFS_IN_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_crc_node(node, len);

}



/**

fs/ubifs/recovery.c

+1 −3
Original line number Diff line number Diff line
@@ -1406,7 +1406,6 @@ static int fix_size_in_place(struct ubifs_info *c, struct size_entry *e) 
	union ubifs_key key;

	int err, lnum, offs, len;

	loff_t i_size;

	uint32_t crc;



	/* Locate the inode node LEB number and offset */

	ino_key_init(c, &key, e->inum);
@@ -1428,8 +1427,7 @@ static int fix_size_in_place(struct ubifs_info *c, struct size_entry *e) 
	ino = c->sbuf + offs;

	ino->size = cpu_to_le64(e->d_size);

	len = le32_to_cpu(ino->ch.len);

	crc = crc32(UBIFS_CRC32_INIT, (void *)ino + 8, len - 8);

	ino->ch.crc = cpu_to_le32(crc);

	ubifs_crc_node((void *)ino, len);

	/* Work out where data in the LEB ends and free space begins */

	p = c->sbuf;

	len = c->leb_size - 1;