From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Behun Date: Thu, 26 Mar 2020 10:02:45 +0100 Subject: [PATCH U-BOOT v2 1/3] fs: btrfs: Use LZO_LEN to replace immediate number In-Reply-To: <20200326053556.20492-2-wqu@suse.com> References: <20200326053556.20492-1-wqu@suse.com> <20200326053556.20492-2-wqu@suse.com> Message-ID: <20200326100245.730679aa@nic.cz> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thu, 26 Mar 2020 13:35:54 +0800 Qu Wenruo wrote: > Just a cleanup. These immediate numbers make my eyes hurt. > > Signed-off-by: Qu Wenruo > Cc: Marek Behun > --- > fs/btrfs/compression.c | 22 ++++++++++++---------- > 1 file changed, 12 insertions(+), 10 deletions(-) > > diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c > index 346875d45a1b..4ef44ce11485 100644 > --- a/fs/btrfs/compression.c > +++ b/fs/btrfs/compression.c > @@ -12,36 +12,38 @@ > #include > #include > > +/* Header for each segment, LE32, recording the compressed size */ > +#define LZO_LEN 4 > static u32 decompress_lzo(const u8 *cbuf, u32 clen, u8 *dbuf, u32 dlen) > { > u32 tot_len, in_len, res; > size_t out_len; > int ret; > > - if (clen < 4) > + if (clen < LZO_LEN) > return -1; > > tot_len = le32_to_cpu(get_unaligned((u32 *)cbuf)); > - cbuf += 4; > - clen -= 4; > - tot_len -= 4; > + cbuf += LZO_LEN; > + clen -= LZO_LEN; > + tot_len -= LZO_LEN; > > if (tot_len == 0 && dlen) > return -1; > - if (tot_len < 4) > + if (tot_len < LZO_LEN) > return -1; > > res = 0; > > - while (tot_len > 4) { > + while (tot_len > LZO_LEN) { > in_len = le32_to_cpu(get_unaligned((u32 *)cbuf)); > - cbuf += 4; > - clen -= 4; > + cbuf += LZO_LEN; > + clen -= LZO_LEN; > > - if (in_len > clen || tot_len < 4 + in_len) > + if (in_len > clen || tot_len < LZO_LEN + in_len) > return -1; > > - tot_len -= 4 + in_len; > + tot_len -= (LZO_LEN + in_len); > > out_len = dlen; > ret = lzo1x_decompress_safe(cbuf, in_len, dbuf, &out_len); Reviewed-by: Marek Beh?n