From nobody Sun Nov 9 03:49:04 2025 X-Original-To: dev-commits-src-main@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 4d3zLS2f47z6G8gV; Sun, 09 Nov 2025 03:49:04 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3zLS1xjgz3tJV; Sun, 09 Nov 2025 03:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762660144; 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=JgWS5CpoT/Gaq9xwhrTOtpTWVXLXz521FsltqHadXnY=; b=nsvb4P6XA0iXFcTOHGfF72KZ8r7kFvKZ39NS7lEwoY+YXfr1No2eU3Qj+wnLgzfCyvtUEJ GGRBt3RVfOXqjDolkE0nB8VUy6r9kjOvj8Eh1Lj1c26AfEshjt9BWWna2VLwIy4L50iXnJ VPmZIaNpa2f2f2i6kkwSevLxhrjLT2ayGr38T6OPr7D7c2n2ytp4tVmnCbCY287Ygp8JaK iE1DBRyqIV7cvNHk9zs3N5rDtvmco+Fd3XkBM6BNyq5rEk2Zk6AJYCfidK31t8sbAP6KQl Xy89WMCr2VnjEHjDJlkp2XNKe7uVZXgYVrUw62mIGWic61vPBSY2ggYbpKXQEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762660144; 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=JgWS5CpoT/Gaq9xwhrTOtpTWVXLXz521FsltqHadXnY=; b=MioB2V0oi8e9zJtIMrWUrTsyYeOouLUB82RfNvo4eeC4lQFIK48UJRQvlx2hO9Hz29N++W f6KjWJ7ydDI+/FPxCuynf0Qe5n1+3Pwi2ABAE9by7ntPruL+vajNqNgO6uhPw5SE+Ej/XI KfNS+OhEIkY0TWjNba5ZFEzZGaD0WTWwH7LRkUXrH+N9773ijshS+P0uQfhSiVeC7JkQCt TIkclHgNVgWb4e/ReF7nWbO114AYWWsgB7LWYgzws1LuuiUXh8lVQ7PW+CZ42OoDEMvA02 e9ryTJwbmOAlCrb/0GEApNLp3aLmZ3iD+hVQHalSopia72ZY0ej70AR+LllJJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762660144; a=rsa-sha256; cv=none; b=bPF+zK/rCc/XSK6xAzOQ6GwSFEkuG+1Xy6PgxXNdNc9Aq8FREifDR8z78pOg7ijr/eJNOQ qj08V1tpuYOexP4h0kC4ucKIO3UfNz1C+wwnyMq8J0EbqsAsbUtvaVV2TQG3SXAsFl0Yb/ PX7UJThtY5Tl3GawpZ82yAxEN9hiKgEQY2v0CdfocARkx4FgQEHWTIG0dtUppmYBFBSjWS tAs8e3txsRvdUPu+N1okD8DYPdB/6CE+lgdAzP7TyLLhH6VVPlh7jpnsWnEyeqBwM4QMVO AM7milbHyyLBH45PuVnJArltov2UU46M23yZC2/2f+YlHT8beti35suOifE4sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3zLS1SJsztR; Sun, 09 Nov 2025 03:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A93n4Jw055222; Sun, 9 Nov 2025 03:49:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A93n4YX055219; Sun, 9 Nov 2025 03:49:04 GMT (envelope-from git) Date: Sun, 9 Nov 2025 03:49:04 GMT Message-Id: <202511090349.5A93n4YX055219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 8b92a6ad597e - main - rm(1): remove whiteouts when forcibly removing directories List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b92a6ad597e224b616a8b1d6983f3b55c85308e Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=8b92a6ad597e224b616a8b1d6983f3b55c85308e commit 8b92a6ad597e224b616a8b1d6983f3b55c85308e Author: Jason A. Harmening AuthorDate: 2025-11-08 04:23:02 +0000 Commit: Jason A. Harmening CommitDate: 2025-11-09 03:47:15 +0000 rm(1): remove whiteouts when forcibly removing directories Commit 2ed053cde5 changed UFS' VOP_RMDIR() behavior to no longer ignore whiteouts when determining whether a directory is empty, unless explicitly requested by the caller. However, this also necessitates a change to rm(1) to avoid breaking the expected behavior when forcibly removing directory hierarchies via `rm -fr`. I neglected to make this follow-on change despite discussing it in the review for the breaking commit (D45987). Finally address the breakage by making `rm -fr` imply FTS_WHITEOUT when rm(1) reads directory contents via fts_read(3). While here, also fix a logic error which produces a spurious 'No error' warning message on stdout for each deleted whiteout. Reported by: csjp Reviewed by: csjp, kib, olce MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53640 --- bin/rm/rm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/rm/rm.c b/bin/rm/rm.c index 16bbf7403fd4..2c41d7380cea 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -184,7 +184,7 @@ rm_tree(char **argv) flags = FTS_PHYSICAL; if (!needstat) flags |= FTS_NOSTAT; - if (Wflag) + if (Wflag || fflag) flags |= FTS_WHITEOUT; if (xflag) flags |= FTS_XDEV; @@ -273,7 +273,7 @@ rm_tree(char **argv) case FTS_W: rval = undelete(p->fts_accpath); - if (rval == 0 && (fflag && errno == ENOENT)) { + if (rval == 0 || (fflag && errno == ENOENT)) { if (vflag) (void)printf("%s\n", p->fts_path);