From nobody Wed Aug 9 23:44:43 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 4RLmqv499Nz4mSyZ; Wed, 9 Aug 2023 23:44:43 +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 4RLmqv3gCWz4Rnt; Wed, 9 Aug 2023 23:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691624683; 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=PAwUeBXVJ7iotCnpXfl0irMH/oYUpTKZgykXUlEXAgY=; b=cCrLpisipVh80Oa7hoyQKCflSrlG5wdGhh8RqLEtULXIKF1ce7u4WuRyZtQYPshAreRMih wry6q6fUTIcrk266THt/UoVIQoIruAX8Niulek/dR+nlD9bVrBE0HLeOFWaeE6E9U1DRQ4 8xTYieBBN22uNArpieq1A+uAPK72aApfqDuKXi3p0JFe7S6v7C148aRzucxvaWiCjI5MpK M3DfWJbPDeDwrxzPpLnuM3JnDjqdtU+hFWC90FVTPOSM9pG/te/sTbmPRomWPMi3L1a8x4 g6b0zlU1prY64vtQIq1FTHEaoipVUWf+lLiUXRMnxCa7n/UQnRiOLR6a4lQxiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691624683; 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=PAwUeBXVJ7iotCnpXfl0irMH/oYUpTKZgykXUlEXAgY=; b=ZWORih70b457+YVFPGxaCL9M+qvYb+u7JYado8piu0hPO4oj0hrYbv5bgf9mIBCiUfh4bX qYeJSXkU2PonZrBLY+Q5pU+7I4izFYkfdFPVcxcCuuNV8k4QWzBKOQNSCA3Yc/O++9JIWy c7pKEdBmXKkabE1/lxlafqGEl4InGNXvsv8nd7nAy8VINtABkF4mvK4HMiCTTkY3De5RMO Et9j/tCtkIWrJy/ogDlnVYd+F41oj5Kv/tQ+89mRv6q99EBmjP6Zh0KII7lFd/hSWVL4Y/ 6Dk9YWGgkbco1NrE/YRlN5pCcoYclfBiVFaJ23VBijmvVSm0MEapReX5YX00jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691624683; a=rsa-sha256; cv=none; b=toPKh0kWQl+u1br82oLgM0xjXKWadgdxbNGmzjkIv0UkiGlxFl0wngA9BccgXbw5NczUUb ZvGU/QpMsLH3TLhMDSna6lX09e+xbabFi0ZkFalFjNXbRh4OzKqlEJILKRATorJX5JEYIM zqx680gGRYPN8jHGP+9mSz+jZtw0BNwazZ9K/VQlFn6zn9dguzgIKTTzvycmNUeRgKIZB5 r3DbweCIy14OLmmEphXoS0bcbvLGKAqM75cn9jJCy7MtakCClMpG481mPNLLA7Y0U5Znj/ N+GRwjFbDu4P32PSaW0YXNgZAs1Pw87AUNynDRXMK5B/dQ70uDNL8zorAPaTaQ== 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 4RLmqv2dy5zbL7; Wed, 9 Aug 2023 23:44:43 +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 379NihAb058234; Wed, 9 Aug 2023 23:44:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379Nih86058231; Wed, 9 Aug 2023 23:44:43 GMT (envelope-from git) Date: Wed, 9 Aug 2023 23:44:43 GMT Message-Id: <202308092344.379Nih86058231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: c52b5d16ccf2 - main - 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/main X-Git-Reftype: branch X-Git-Commit: c52b5d16ccf29ad0e999a1f5f813ed6472aa3771 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c52b5d16ccf29ad0e999a1f5f813ed6472aa3771 commit c52b5d16ccf29ad0e999a1f5f813ed6472aa3771 Author: Kirk McKusick AuthorDate: 2023-08-09 23:43:41 +0000 Commit: Kirk McKusick CommitDate: 2023-08-09 23:44:24 +0000 Remove a partial UFS/FFS snapshot if it fails to build successfully. When taking a UFS/FFS snapshot, it may not succeed for example if the filesystem is too full to hold it. When a snapshot is unable to be successfully taken, the partial snapshot should be removed. Reported-by: Peter Holm Tested-by: Peter Holm MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- 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 26eecfcc5875..6a3329078817 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_PNBUF(&nd); 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); + 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);