From nobody Sun Nov 16 03:52:07 2025 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 4d8H4l6RVdz6Gswq; Sun, 16 Nov 2025 03:52:07 +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 4d8H4l5ckhz3w16; Sun, 16 Nov 2025 03:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763265127; 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=KVrwV4fQHLaYyQi6ep+p2B/a0x7lwMJi+AIou++/6uM=; b=FqsfHyDcpybnKdYNFCDY8Ze9wpCd9qN8N/O9LC5jZi8V5tZK36PbtAgThO8XZbqLwxbhkl xldcDJx1vsFXKICe1/HBbBrppzmFOwl8QycgIAZxZZE5k9JxW5egCMjEk3YMDJUriE4vvm z5XSMqmDH8/2TmGydt5EPGLOImdPpgTN/cSv4RoHzrwsQYJUUjHlPkhovKRBLeiC99FNvc BD3mTi5U+qWcIIuzEAZKhgeR0mRdeFLcKBUPeYKT7jAW3sKknXCri7dNBtc7Kgbvvcp3kD T6SyvBsfS2flx83dpjButukCZmnlDJFXBkcvcetySzY9Y31beOh/ZeyPjYdhyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763265127; 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=KVrwV4fQHLaYyQi6ep+p2B/a0x7lwMJi+AIou++/6uM=; b=F2GGz6PcsjT2dHAZymTywX626v5MuwZyPV9MLCPcXHGEaVoiooAG3g0TIGCppM2yROBQSD +EHNcgKYk2HvTMOFgntpXUslnhreVv7JwvlBQ0yc3MUrJ6CyfuDSB7L1EawfxKuUMAc+P2 85qmtFJPpuGlHtB+VxtxQjg4/xJC4e83acb3fFzboO+SU3uv3j9eb72DdIM0Xm+KQiW3IU vNZPcP5yUlfOtDpjcf+2iwPp7BrL1Y91AMWrvDH13R1g6my4Wt4zMBozGqIx6lEWWsKlFB /5P7aBGOUxC4dBKdZeqet2Rh/ow1CkTb2N2rsW/6x3epwkPc7vPcaGmMuV0p/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763265127; a=rsa-sha256; cv=none; b=UsIHA9j9Ymxj6dQYCiU+p+gheRVHz7YkbTbaUmTJMq0nq1XayhNwT8BbmzWygpU6aN0WV5 bSxfypFHamiTIh1zpY97/1Pvlbq0cxy1x0SwsAj2W1fdFPGvgXr+rtbEQt+8aTbl92KQpA jIPBCpvbUcWCV/ZK885q4xGvtwu+jbze0SQY4criHb35vzhNCifC2YchvvBFf9MHqQslRa 7fmv52/H7eOHyJlrwxSsaUo/fhnvy+EsyIRBvtIhOWOkIgFD5WKqunvcMt+xfWKcErX5qI 1xPsfVdAI9ZHC/lTcRSqZy6ZohcoVtKxJFm9ARTe1+5yl7A/S4V24gHeTgKioQ== 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 4d8H4l5Bfzz69y; Sun, 16 Nov 2025 03:52:07 +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 5AG3q7tq068165; Sun, 16 Nov 2025 03:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3q7oi068162; Sun, 16 Nov 2025 03:52:07 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:52:07 GMT Message-Id: <202511160352.5AG3q7oi068162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: ac4b39441773 - stable/15 - rm(1): remove whiteouts when forcibly removing directories 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: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ac4b39441773bc0d43f9d1aff9b0f82d83a9a97e Auto-Submitted: auto-generated The branch stable/15 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=ac4b39441773bc0d43f9d1aff9b0f82d83a9a97e commit ac4b39441773bc0d43f9d1aff9b0f82d83a9a97e Author: Jason A. Harmening AuthorDate: 2025-11-08 04:23:02 +0000 Commit: Jason A. Harmening CommitDate: 2025-11-16 03:51:26 +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 Differential Revision: https://reviews.freebsd.org/D53640 (cherry picked from commit 8b92a6ad597e224b616a8b1d6983f3b55c85308e) --- 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);