[PATCH] ubifs: remove unnecessary check in ubifs_log_start_commit

[PATCH] ubifs: remove unnecessary check in ubifs_log_start_commit

[Liu Song]

The value of c->lhead_offs cannot exceed max_len which much
smaller than c->leb_size. So the check will never be true.
Just remove it.

Signed-off-by: Liu Song <liu.song11@zte.com.cn>
Reviewed-by: Jiang Biao <jiang.biao2@zte.com.cn>
---
 fs/ubifs/log.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c
index 7cffa120a750..5a338737223b 100644
--- a/fs/ubifs/log.c
+++ b/fs/ubifs/log.c
@@ -427,10 +427,6 @@ int ubifs_log_start_commit(struct ubifs_info *c, int *ltail_lnum)
 	*ltail_lnum = c->lhead_lnum;
 
 	c->lhead_offs += len;
-	if (c->lhead_offs == c->leb_size) {
-		c->lhead_lnum = ubifs_next_log_lnum(c, c->lhead_lnum);
-		c->lhead_offs = 0;
-	}
 
 	remove_buds(c);
 
-- 
2.17.1

Re: [PATCH] ubifs: remove unnecessary check in ubifs_log_start_commit

[Richard Weinberger]

Liu Song,

Am Dienstag, 21. August 2018, 05:17:22 CEST schrieb Liu Song:
> The value of c->lhead_offs cannot exceed max_len which much
> smaller than c->leb_size. So the check will never be true.
> Just remove it.

Please explain in more detail why this case is never ever possible.
Removing such code needs a good justification. 

In general I don't much like such changes for two reasons:
1. They don't fix a problem
2. They are likely to introduce very hard to debug new issues if they are wrong

Thanks,
//richard

Re: [PATCH] ubifs: remove unnecessary check in ubifs_log_start_commit

[Richard Weinberger]

Am Dienstag, 21. August 2018, 08:57:44 CEST schrieb liu.song11@zte.com.cn:
> Hi Richard,
> 
> In ubifs_log_start_commit, the value of c->lhead_offs is zero or set to zero by code bellow
> 409         /* Switch to the next log LEB */
> 410         if (c->lhead_offs) {
> 411                 c->lhead_lnum = ubifs_next_log_lnum(c, c->lhead_lnum);
> 412                 ubifs_assert(c->lhead_lnum != c->ltail_lnum);
> 413                 c->lhead_offs = 0;
> 414         }
> 
> The value of 'len' can not exceed 'max_len' which assigned value by code bellow
> 370         max_len = UBIFS_CS_NODE_SZ + c->jhead_cnt * UBIFS_REF_NODE_SZ;
> 
> So, the value of c->lhead_offs cannot exceed 'max_len' 
> 429         c->lhead_offs += len;
> 430         if (c->lhead_offs == c->leb_size) {
> 431                 c->lhead_lnum = ubifs_next_log_lnum(c, c->lhead_lnum);
> 432                 c->lhead_offs = 0;
> 433         }
> 
> Usually, the size of PEB is between 64KB and 256KB, and in UBIFS, the value of
> c->lhead_offs far less than UBIFS_BLOCK_SIZE which equal to 4096. So I think
> the value of c->lhead_offs far less than c->leb_size, the check in line 430 seem 
> never to be true.

Okay, now it makes sense.
But what has this do to with UBIFS_BLOCK_SIZE?

Anyway, your patch description needs to be more detailed.
What you explained to me right now needs to go in the commit message.
Then people can understand why the check is not needed.
For the sake of paranoia and debug-ability, please also add a
ubifs_assert(c->lhead_offs < c->leb_size);.

Thanks,
//richard