From nobody Tue Feb 17 18:34:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFpFw1mPhz6Rrcw for ; Tue, 17 Feb 2026 18:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFpFw0vYcz3Ry6 for ; Tue, 17 Feb 2026 18:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771353268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6TLb5+FzAIhukhZzPkt/ByDLaM0emzryuYeWnvhtL0=; b=LjlbKfYO+E6rGejMonOxxF0+JEabTvJyQlH8Qt9l9dtpJfNSYSx3SxW+phBUtiwh8oF4Mx TFIxKI1wRALOnwy/mLF5nZKF5Tdjym0VwhQe+8AmDACwSDOqvxW8a7UFCGt0V4zda0SeTz 9dZPz4LPz6xbVF9JhnG9rhcmb6fmp/YVK5me3VglsBXiwn1HvrVY0dF0ljjkva0GxU3s9Y bF3ngSX6uCr7FdwN0yk0w67M23cthHo4/oP6aqburkqDSdjGy80CFNuHfC6EG1GXfG73mg bTXzQy1dKcu0KHPRaiITnCyhusa482bBP/CUE25dLjxCbFvp7sfAKULlQFl6dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771353268; a=rsa-sha256; cv=none; b=puUvl8p+LWfYBNBVWj28cV6gL6EjgzppTTp47VgI1Iy4Fxq2egECfxMeUNa8MtuyWF20BC d+GpAXQovhGrI4CHrSI9rTgS4omFocrYE+a+zbvOugZSQqWYdXOa3knjQNkTjSxpMGag/X qsbvjbW9Y9Xw0tLUTcQ6rGjK6UimcgQ4UKgfadZezBPKxGLbUyWogQHfAxi5UAxrauKSXq rIkVoqeVUijSi/fFGQoRYBhRkctH+o2pbz8UAHzVCv2GkraUfqe2qSBIuT37Dt4s8NyhHh 62I7jtGUVHGCluxyNxnvD0aAukL2AEM0Rm+AB0nJHrf8nFhs2ji85RUlIi7KQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771353268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6TLb5+FzAIhukhZzPkt/ByDLaM0emzryuYeWnvhtL0=; b=ybpkf21r6IBAsF2KS7BrPLfcCNuBky55ylXoIa667FL5R36wkUj0iLdVryE/WBxJJrNX2X hwUw9XhyZ7rQrY4UDqvcr4j+k73nodAPkWckL5Ma9kc/vJiUT6baORvY3RxNL6UVWjSSlM NUCvoi6GgRAleGd4HjvF+DIK8nF/9p2Yxy1Pqw98cu8645EfEVgMJJ/gMU0rAScfSZRhPu 6yCyOFZiIAdXyAAQg/tu/12A4RzZFGDdBVuoraWw3SJnBrzftljYIrMfxSBv8iT+SqM8v6 lpq2qJbGCr0rujulnW/ZPvW+wRUvZQu644TNbcglyjC03stKvdq840iEnKGy3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFpFw0F6Bz6NM for ; Tue, 17 Feb 2026 18:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3894c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 18:34:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: d7d0369ad331 - main - recoverdisk: Ensure medium_read is multiple of small_read. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7d0369ad331d17ca2bc0076b2f1ab8bed88c5f4 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 18:34:28 +0000 Message-Id: <6994b4b4.3894c.1eb1087d@gitrepo.freebsd.org> The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=d7d0369ad331d17ca2bc0076b2f1ab8bed88c5f4 commit d7d0369ad331d17ca2bc0076b2f1ab8bed88c5f4 Author: Poul-Henning Kamp AuthorDate: 2026-02-17 18:33:41 +0000 Commit: Poul-Henning Kamp CommitDate: 2026-02-17 18:33:41 +0000 recoverdisk: Ensure medium_read is multiple of small_read. --- sbin/recoverdisk/recoverdisk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/recoverdisk/recoverdisk.c b/sbin/recoverdisk/recoverdisk.c index 5971f78738ac..a002a8304579 100644 --- a/sbin/recoverdisk/recoverdisk.c +++ b/sbin/recoverdisk/recoverdisk.c @@ -677,6 +677,9 @@ determine_read_sizes(void) l <<= 1; } medium_read = h; + medium_read -= medium_read % small_read; + if (medium_read < small_read) + medium_read = small_read; printf("# Got medium_read from small_read & big_read: %ju\n", (uintmax_t)medium_read );