From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 5033E1FF0ED for ; Fri, 31 Jul 2026 16:25:25 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 94B8D21563; Fri, 31 Jul 2026 16:25:23 +0200 (CEST) From: Robert Obkircher To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup 7/9] datastore: simplify FixedIndexReader::chunk_info Date: Fri, 31 Jul 2026 16:21:20 +0200 Message-ID: <20260731142430.289893-8-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260731142430.289893-1-r.obkircher@proxmox.com> References: <20260731142430.289893-1-r.obkircher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1785507907599 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.139 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: R472QMZAXGE34XFE3MAX3Z7QLLXR5MIC X-Message-ID-Hash: R472QMZAXGE34XFE3MAX3Z7QLLXR5MIC X-MailFrom: r.obkircher@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is mainly done so the index_length field can be removed. Signed-off-by: Robert Obkircher --- pbs-datastore/src/fixed_index.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs index 1d3d0170a..29927aeba 100644 --- a/pbs-datastore/src/fixed_index.rs +++ b/pbs-datastore/src/fixed_index.rs @@ -165,18 +165,11 @@ impl IndexFile for FixedIndexReader { } fn chunk_info(&self, pos: usize) -> Option { - if pos >= self.index_length { - return None; - } + let digest = self.index_digest(pos)?; let start = (pos * self.chunk_size) as u64; - let mut end = start + self.chunk_size as u64; - - if end > self.size { - end = self.size; - } + let end = (start + self.chunk_size as u64).min(self.size); - let digest = self.index_digest(pos).unwrap(); Some(ChunkReadInfo { range: start..end, digest: *digest, -- 2.47.3