[PATCH] ubifs: Simplify the code and remove unnecessary parameters.

[PATCH] ubifs: Simplify the code and remove unnecessary parameters.

[Xichao Zhao]

Remove the parameter '*c' from the ubifs_crc_node function,
and replace part of the code using ubifs_crc_node.

Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
---
 fs/ubifs/io.c    | 13 ++++---------
 fs/ubifs/ubifs.h |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index a79f229df475..6c6d68242779 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -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 */
@@ -395,7 +392,7 @@ void ubifs_init_node(struct ubifs_info *c, void *node, int len, int pad)
 	}
 }
 
-void ubifs_crc_node(struct ubifs_info *c, void *node, int len)
+void ubifs_crc_node(void *node, int len)
 {
 	struct ubifs_ch *ch = node;
 	uint32_t crc;
@@ -432,7 +429,7 @@ int ubifs_prepare_node_hmac(struct ubifs_info *c, void *node, int len,
 			return err;
 	}
 
-	ubifs_crc_node(c, node, len);
+	ubifs_crc_node(node, len);
 
 	return 0;
 }
@@ -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);
 }
 
 /**
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 5db45c9e26ee..5d172509091a 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -1743,7 +1743,7 @@ int ubifs_write_node_hmac(struct ubifs_info *c, void *buf, int len, int lnum,
 int ubifs_check_node(const struct ubifs_info *c, const void *buf, int len,
 		     int lnum, int offs, int quiet, int must_chk_crc);
 void ubifs_init_node(struct ubifs_info *c, void *buf, int len, int pad);
-void ubifs_crc_node(struct ubifs_info *c, void *buf, int len);
+void ubifs_crc_node(void *buf, int len);
 void ubifs_prepare_node(struct ubifs_info *c, void *buf, int len, int pad);
 int ubifs_prepare_node_hmac(struct ubifs_info *c, void *node, int len,
 			    int hmac_offs, int pad);
-- 
2.34.1


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Re: [PATCH] ubifs: Simplify the code and remove unnecessary parameters.

[Richard Weinberger]

----- Ursprüngliche Mail -----
> Von: "Xichao Zhao" <zhao.xichao@vivo.com>
> An: "richard" <richard@nod.at>
> CC: "chengzhihao1" <chengzhihao1@huawei.com>, "linux-mtd" <linux-mtd@lists.infradead.org>, "linux-kernel"
> <linux-kernel@vger.kernel.org>, "Xichao Zhao" <zhao.xichao@vivo.com>
> Gesendet: Montag, 11. August 2025 12:15:29
> Betreff: [PATCH] ubifs: Simplify the code and remove unnecessary parameters.

> Remove the parameter '*c' from the ubifs_crc_node function,

...because c is not used?

> and replace part of the code using ubifs_crc_node.

This are two things, one logical change per commit, please.

Thanks,
//richard

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Re: [PATCH] ubifs: Simplify the code and remove unnecessary parameters.

[Zhihao Cheng]

在 2025/8/11 18:15, Xichao Zhao 写道:
> Remove the parameter '*c' from the ubifs_crc_node function,
> and replace part of the code using ubifs_crc_node.
> 
> Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
> ---
>   fs/ubifs/io.c    | 13 ++++---------
>   fs/ubifs/ubifs.h |  2 +-
>   2 files changed, 5 insertions(+), 10 deletions(-)
> 

Hi, I think the code of crc calculation in fix_size_in_place() can be 
replaced too. If not, we could make ubifs_crc_node() be static.

> diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
> index a79f229df475..6c6d68242779 100644
> --- a/fs/ubifs/io.c
> +++ b/fs/ubifs/io.c
> @@ -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 */
> @@ -395,7 +392,7 @@ void ubifs_init_node(struct ubifs_info *c, void *node, int len, int pad)
>   	}
>   }
>   
> -void ubifs_crc_node(struct ubifs_info *c, void *node, int len)
> +void ubifs_crc_node(void *node, int len)
>   {
>   	struct ubifs_ch *ch = node;
>   	uint32_t crc;
> @@ -432,7 +429,7 @@ int ubifs_prepare_node_hmac(struct ubifs_info *c, void *node, int len,
>   			return err;
>   	}
>   
> -	ubifs_crc_node(c, node, len);
> +	ubifs_crc_node(node, len);
>   
>   	return 0;
>   }
> @@ -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);
>   }
>   
>   /**
> diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
> index 5db45c9e26ee..5d172509091a 100644
> --- a/fs/ubifs/ubifs.h
> +++ b/fs/ubifs/ubifs.h
> @@ -1743,7 +1743,7 @@ int ubifs_write_node_hmac(struct ubifs_info *c, void *buf, int len, int lnum,
>   int ubifs_check_node(const struct ubifs_info *c, const void *buf, int len,
>   		     int lnum, int offs, int quiet, int must_chk_crc);
>   void ubifs_init_node(struct ubifs_info *c, void *buf, int len, int pad);
> -void ubifs_crc_node(struct ubifs_info *c, void *buf, int len);
> +void ubifs_crc_node(void *buf, int len);
>   void ubifs_prepare_node(struct ubifs_info *c, void *buf, int len, int pad);
>   int ubifs_prepare_node_hmac(struct ubifs_info *c, void *node, int len,
>   			    int hmac_offs, int pad);
> 


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/