[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 6/7] xz: move s->lzma.len = 0 initialization to lzma_reset()
- To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Jan Beulich <jbeulich@xxxxxxxx>
- Date: Mon, 6 Dec 2021 14:32:46 +0100
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0H0YRL04KECEnhSZHc0txOpsgQMjHkGgxeFv8W2+jqE=; b=f0uVbyaYbJzew4awXtkAUJB/GXEP+g7qkTYFwiZLvhuV2a0R9OyOGEuaZs94USVdMAkaCUrFIg8xzQ80C9ajShp1i4JKNb2nbR8HsCjFQ8ZNjEsSFq2kO64JOUIaXCjEPxKQ7NUL8wdKMlNKYitl5PK4Rcx7kQ1wamDHUCjnHPopD+uaH1HTPdM9+pKXHEwcu9YAfbsIAoANv3EBuie+fMP4ZwPC3makoJSD/d2MUvU9ejepeRD35mLDqTCurwspfDhgfZJ+dVfnbdpW0X60rmNcMdkzL8Vsiicu5emVCsGteHec1v7p5GtcTBnVnmeRATRMpxovlYXqhEV3G7Y0QA==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UuusALwaYDo70rTqtwEigMhnhMGU3Vvh3d7lBVjX9Q10tZrOn1xr+9RL9BCE9toUlvKXSZWOwC6+wI1sbgW5T4OhalDG9woYMDTF7Qoo0E/V5oB6CVeortBtMXvyX+VNA2NVGYQ4fm69UXIgmkFzz8XIMr1U82Nkn2LfVWuiDydvJwsbz3vAiR4OXL7FdtH0ClKT+qBN/8cS7RZejGqajArztcncoOySBc3OXehbgqevhS/ArdlyM15JW1K81BmplCs98v1u4yWmzZNoj6eHIGzNVqv7Qqj8YYvAOQcc7eKta/ibKe9HJnmMZlT+YgVrTBV8nhKlRGEB0JoC2uw5Vw==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com;
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>, Ian Jackson <iwj@xxxxxxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Mon, 06 Dec 2021 13:37:01 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
From: Lasse Collin <lasse.collin@xxxxxxxxxxx>
It's a more logical place even if the resetting needs to be done
only once per LZMA2 stream (if lzma_reset() called in the middle
of an LZMA2 stream, .len will already be 0).
Link: https://lore.kernel.org/r/20211010213145.17462-4-xiang@xxxxxxxxxx
Signed-off-by: Lasse Collin <lasse.collin@xxxxxxxxxxx>
Signed-off-by: Gao Xiang <hsiangkao@xxxxxxxxxxxxxxxxx>
[Linux commit: a98a25408b0e9b0264abcc3dabfafd9ff2ea1046]
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Reviewed-by: Luca Fancellu <luca.fancellu@xxxxxxx>
---
v2: Retain one more S-o-b.
--- a/xen/common/xz/dec_lzma2.c
+++ b/xen/common/xz/dec_lzma2.c
@@ -791,6 +791,7 @@ static void __init lzma_reset(struct xz_
s->lzma.rep1 = 0;
s->lzma.rep2 = 0;
s->lzma.rep3 = 0;
+ s->lzma.len = 0;
/*
* All probabilities are initialized to the same value. This hack
@@ -1174,8 +1175,6 @@ XZ_EXTERN enum xz_ret __init xz_dec_lzma
}
}
- s->lzma.len = 0;
-
s->lzma2.sequence = SEQ_CONTROL;
s->lzma2.need_dict_reset = true;
|
