From nobody Sun Aug 20 04:28:24 2023 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 4RT2fc45jSz4qgnK; Sun, 20 Aug 2023 04:28:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RT2fc2VkTz4QR3; Sun, 20 Aug 2023 04:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505704; 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=22oaC+6roPsVzgJSJ/IApTSDPj1WN7zD2nkjZektNek=; b=ea2nBLj4qE0BzM1f7zWTJ/Gd4RWBDWt8IzXDFzM1hLoQuArvnZzmneCqEIYRIKUdtXIv1m h44aBNnXIzwaxAuuRTjyQbzFv3Pnb2pmIXl0H0iZJCMdLFAsBfKLUDEqSvmpAG9cbF4KQJ iB+ShlpFurrPMkmiIX+kl7DsjQCK1ur7wRpqJCCNyfEO/KOVs+BFCXdUSbCSraF+cWdsj5 I96+5jbEdxY2fey5iy8NdhTeoU0iv92yZvxDBSWoEMh3NJ5hkzWxWAr1fyfX69+w4AkpVQ TnOOxB66DOy7d0CIEnVxYV0JBiPzGd/Tl8WHAhVwafnygZ04CgeAwB1wJgbSqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505704; 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=22oaC+6roPsVzgJSJ/IApTSDPj1WN7zD2nkjZektNek=; b=GwRZsOonjTgDnjP3m10yJm0I8xoIhraJRhrEWdwlaH2c4Ih6Cd1AgScK7l+lYlzRBrGQ/i H0PmJGYmyH+fVf3pEZpy3cpfDIxQybh7aqqw+1nOjY0wqEwtiRFABzaSNJnEXJpLFfvta5 ptdTJ1IJtb7BwCy6GyCHzdAsk21f4RSYXPzZiFrUozIfsZKTokqywG3ijK4N/yb4z7K+qG v/Ne8aRGxQD9EfHK+nti8+vTNU8o8A7C1KUYblrj/5T8geKlAJPmuKNeTbZZU58AbxhBhH v1e/TRCvKRAdpVAg0kmhfgVF14KfB7fpHc7z5gxFclPU9Ag8r//J3z+upwV1Ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505704; a=rsa-sha256; cv=none; b=M3GmbnQVYCDaVhkhvwtxZATphL22soDKOsxLT2M7yytPCygUY0+QEg+kJW3zajL81fBiAM f7bGWqBYkdpDKyhF9+Ps3MBu9o0akvNm3nouiWtDs+vX8o7PE0ACA8on6C9RWQvmtT6DsK MTYc2PtIsVeUFymSTqFcv9503OSPISXCt7Xt3A+tNNwIzZPUsq7b90NSlsQEZMWPg92Sl9 AjjUa9XOj2qggEeSbf9D/QVcmLr9pWVaZJ9uQceDv5SI4gwibbiUCpQP8zbCReLeYnPGRZ rmXwCk1YJn51qgg3Ad4UgAvkVeizuOP95bKROWeA9gWW3zIg8dtcWZFGEdpisQ== 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 4RT2fc1bzbz9kr; Sun, 20 Aug 2023 04:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K4SOR8033601; Sun, 20 Aug 2023 04:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SOqU033598; Sun, 20 Aug 2023 04:28:24 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:24 GMT Message-Id: <202308200428.37K4SOqU033598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 2d20a3178a72 - stable/13 - Remove a partial UFS/FFS snapshot if it fails to build successfully. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2d20a3178a72c84eb83816a3c6c98629bcb84c72 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=2d20a3178a72c84eb83816a3c6c98629bcb84c72 commit 2d20a3178a72c84eb83816a3c6c98629bcb84c72 Author: Kirk McKusick AuthorDate: 2023-08-09 23:43:41 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:38 +0000 Remove a partial UFS/FFS snapshot if it fails to build successfully. Reported-by: Peter Holm Tested-by: Peter Holm Sponsored-by: The FreeBSD Foundation (cherry picked from commit c52b5d16ccf29ad0e999a1f5f813ed6472aa3771) --- sys/ufs/ffs/ffs_snapshot.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index b606c64241e3..5ceca72fd44f 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -851,7 +851,6 @@ done: free(copy_fs, M_UFSMNT); copy_fs = NULL; out: - NDFREE(&nd, NDF_ONLY_PNBUF); if (saved_nice > 0) { struct proc *p; @@ -869,14 +868,30 @@ out: MNT_ILOCK(mp); mp->mnt_flag = (mp->mnt_flag & MNT_QUOTA) | (flag & ~MNT_QUOTA); MNT_IUNLOCK(mp); - if (error) - (void) ffs_truncate(vp, (off_t)0, 0, NOCRED); - (void) ffs_syncvnode(vp, MNT_WAIT, 0); - if (error) - vput(vp); - else - VOP_UNLOCK(vp); + NDFREE_PNBUF(&nd); vrele(nd.ni_dvp); + if (error == 0) { + (void) ffs_syncvnode(vp, MNT_WAIT, 0); + VOP_UNLOCK(vp); + } else if (VN_IS_DOOMED(vp)) { + vput(vp); + } else { + int rmerr; + + /* Remove snapshot as its creation has failed. */ + vput(vp); + NDINIT(&nd, DELETE, LOCKPARENT | LOCKLEAF, UIO_SYSSPACE, + snapfile, td); + if ((rmerr = namei(&nd)) != 0 || + (rmerr = VOP_REMOVE(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd)) != 0) + printf("Delete of %s failed with error %d\n", + nd.ni_dirp, rmerr); + NDFREE_PNBUF(&nd); + if (nd.ni_dvp != NULL) + vput(nd.ni_dvp); + if (nd.ni_vp != NULL) + vput(nd.ni_vp); + } vn_finished_write(wrtmp); process_deferred_inactive(mp); return (error);