From nobody Sun Apr 12 13:44:19 2026 X-Original-To: dev-commits-src-branches@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 4ftsGD1K1vz6ZMDq for ; Sun, 12 Apr 2026 13:44:20 +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 4ftsGC5sxbz3kyT for ; Sun, 12 Apr 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001459; 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=ylFVjQDAuaSUhdd8wJW8RVA3vGLlBHho+qptVhy9wWU=; b=waEXMaqkx5UMNA3904RBt3BFRgV4JkO7X+IpH5vVQxpNWZKaKkO4+6ej6Qc8EBiOS3Fwe3 HxFQLd/bWAP2jdgCdnh++CqOH6mYnzqgVf8LKF4lT00DqE/9++Zu5xp1GtgeoQ8xSbagiZ 5TtOIBx2sIcvGh6xx7Ni+aj5PggOExPdTPsdE1SATwUCrzt8KbgqMzedAuybm5tcRyka3M zdFGOLN+ZU4b9U7KPfoI4ks48JxZqF/ojTVbY+20HrqBPu9TGAqX1Z9kWO/DiUlJTaGece B+mTVsqN9dD2D+DDRmWUZFZciwUwLfdxxkyTj4TOsJ76SfpetESs5lfsooyjNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001459; a=rsa-sha256; cv=none; b=vCN4dZmMlAffBMAaORYyCFYTNIyySnchPQQ/oTmk9IutV1em1o6cYDT3zSmKTNw6qckTRw F/vHddPDS2JAbF9Fydxw0wNDAALFFP736mSfE2qZTqnJi+0/7tQrYfVh7FSe5L24iBlsoE 3cqXoXdKgVXbTJd+YP7yXSnBxM8UnNmDgZsaITOoboTqZTYeMZwHGyHT0JHIBAe+2wAdV5 JW3t3X9U7sDzJn/g9rBpK4mfJ3zqb/actZ3Nrr2yhAi23jtApNXUd8gP7IkZgzyUbouIvA /tHe1j/TQni2k4XoHVMBDSe7zhPdncL5u6lNa3RTHUUzGKbaLK024FCL3Zwd1w== 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=1776001459; 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=ylFVjQDAuaSUhdd8wJW8RVA3vGLlBHho+qptVhy9wWU=; b=XeNHIcvaSKR+teundfYwpNsiJg+TfNr6cUWHaWez+7sGJ1j50BZif5gLhjzqRTtrkdnVMk Ns7cXQlJJbfawYmlFjeaeHFW4YURmJoyDwNVcS+25+CMX2H9FAduiynZVkN3E8/uwxc4Iz s0VbhdKF2zsfWMYLKgsHQEraSSSNpeUHIzm/dI3vYmd/w6QXVFNRrcsZNc66A+VWfyzylA bUvLG2CP7iaa1KEeOhiD0suZiciYOoVGHdBCqO8kYhEOQfk1/3JykqJDnQglaizfeJsRR5 6VCyGaNMfQfLwxuF4QRsEmRcaTinA795Fgitl5lJvjQ+u3qIcmSSDAX78hDseg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGC5G4pz41N for ; Sun, 12 Apr 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43291 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 605fd428297c - stable/14 - truncate: fix a minor nit + add a hole-punching test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 605fd428297c464ccb4081af02efdffc6f9a453b Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:19 +0000 Message-Id: <69dba1b3.43291.16bf4eb9@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=605fd428297c464ccb4081af02efdffc6f9a453b commit 605fd428297c464ccb4081af02efdffc6f9a453b Author: Kyle Evans AuthorDate: 2026-01-21 23:34:27 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:41 +0000 truncate: fix a minor nit + add a hole-punching test The struct spacectl_range we use is only really used in these three lines of code, so re-scope it down to just the dealloc branch. This is marginally easier to reason about what might be necessary to replace in porting our truncate(1) to other platforms. While we're here, add a test for the -d flag to be sure it really does punch a hole in the file. The test also tries to confirm that it does not disturb other segments of the file in the process, just to inspire some confidence that it's not corrupting the file somehow. Sponsored by: Klara, Inc. Reviewed by: markj (cherry picked from commit eacc501eff52db16b7b784c89a3a4a03c9a3ef34) --- usr.bin/truncate/tests/truncate_test.sh | 48 +++++++++++++++++++++++++++++++++ usr.bin/truncate/truncate.c | 3 ++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/usr.bin/truncate/tests/truncate_test.sh b/usr.bin/truncate/tests/truncate_test.sh index ec219059de42..845b3e1b4d84 100644 --- a/usr.bin/truncate/tests/truncate_test.sh +++ b/usr.bin/truncate/tests/truncate_test.sh @@ -438,6 +438,53 @@ rounddown_zero_body() [ ${st_size} -eq 0 ] || atf_fail "new file should now be 0 bytes" } +atf_test_case deallocate +deallocate_head() +{ + atf_set "descr" "Verifies that -d punches a hole in the file" + atf_set "require.user" "root" +} +deallocate_body() +{ + blocksz=$(stat -h . | cut -f1 -d' ') + atf_check test -n "$blocksz" + + # We use /dev/random here to defeat ZFS compression, which would + # collapse ranges of zeroes into holes without us deallocating it. This + # isn't a concern below because those are specificially for creating our + # reference files -- we expect the deallocate operation to result in + # ranges of zeroes, whether they end up creating a hole or not. + filesz=$((blocksz * 3)) + atf_check -e not-empty dd if=/dev/random of=sparse \ + bs=${filesz} count=1 conv=notrunc + + atf_check cp sparse sparse.orig + atf_check cp sparse sparse.orig.orig + + # Punch a hole in the middle, ensure that bit is zeroed out. + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=1 count=1 conv=notrunc + atf_check truncate -d -o ${blocksz} -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig + + # Clobber the end part of the original file and punch a hole in + # the same spot on the new file, ensure that it has zeroed out that + # portion. + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=2 count=1 conv=notrunc + atf_check truncate -d -o $((blocksz * 2)) -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig + + # Now bring the original file back and make sure that punching a hole + # in data at the beginning doesn't disturb the data at the end. + atf_check cp sparse.orig.orig sparse.orig + atf_check cp sparse.orig.orig sparse + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=0 count=1 conv=notrunc + atf_check truncate -d -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig +} + atf_init_test_cases() { atf_add_test_case illegal_option @@ -459,4 +506,5 @@ atf_init_test_cases() atf_add_test_case roundup atf_add_test_case rounddown atf_add_test_case rounddown_zero + atf_add_test_case deallocate } diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c index d8484257294a..15be339df0e3 100644 --- a/usr.bin/truncate/truncate.c +++ b/usr.bin/truncate/truncate.c @@ -62,7 +62,6 @@ main(int argc, char **argv) int do_refer; int got_size; char *fname, *rname; - struct spacectl_range sr; fd = -1; rsize = tsize = sz = off = 0; @@ -198,6 +197,8 @@ main(int argc, char **argv) tsize = 0; if (do_dealloc == 1) { + struct spacectl_range sr; + sr.r_offset = off; sr.r_len = len; r = fspacectl(fd, SPACECTL_DEALLOC, &sr, 0, &sr);