From nobody Mon Dec 19 08:14:41 2022 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 4NbCDL1fMtz1G1SD; Mon, 19 Dec 2022 08:14:42 +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 4NbCDL0nZLz3Lpn; Mon, 19 Dec 2022 08:14:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671437682; 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=tSBRHH8s7QmzzagJ5Ubf+f0ypUq3og5oDi1dw9uMzYw=; b=WjNsDReKIT0Uzl33O3QmsE77K9kmBKtqxzhITbEgnH2TAktKZK3w/t/KLsrHS1UFyBrlwB /UOh4ZpFHYGPf8ppSyUQ2MipQKAwvHKJCqZYREOrQTxM5J+ejkOebSScnLc18u2KIEWmBh pxdrDZRjacO+7VsMIeRpcOfQS5ekS1kDeVElFF3F5Rd8LZdSiUK9+Oh++vfeyyqJsHakzY gsRtgCzI0JYevIsQrNGNp0fZJt5hopNYFaXmUPTcKnoIJr36iyIhEAeW2aQUoPxMfi9XJm fOiBOOhRk2YjVHiVRjmTaAX6E+SQRgbtkXxaat2rFYRRYT1fw6O9oHbgmc9U4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671437682; 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=tSBRHH8s7QmzzagJ5Ubf+f0ypUq3og5oDi1dw9uMzYw=; b=d1Ul55mfvEbr8OFSOpSGK/ERo0Ob4s5tODAbNWjhlpZdy6zOYsMxSZK91PArLCHVPg/t5N ionB/ZD70SFU7BClvVc1Gfh6XDX4weVGFV1+w8nuvYcsQkqQRkYJoN//SJi0nwxbvd0qcX kvN0n3okV5l41qGocr6Cfb03n5D+x+Uk7FSN53R4O7TpXd6k9qFawlu3Rkm1CFARFqz60n EbtEoAhHwRbqOwCopbyiwfYPwZcSjNbXc5rdSgov8EcMMSzie9dxJvH7wEwAKoTExI/9gV iiGWciSR1DfnBS7hI+gOeNJn71IazN0rKC1PzcTL0ULVht6fLtBuYX8D2o0Uuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671437682; a=rsa-sha256; cv=none; b=Lr6Nuen2X4oQqwMjYz6V9EH3UETyfsyXZgXAvJuKE/3r+OAj8VssQpsLzU3c8jRZhmttX8 M0Z3vzTOB77Z7iroK5oTI0K0EVKlfq7ye8jjGYCciNxKDC2huSp/LYXur+y+mHpbuNzrVI okV7Tpwg6xOccZF7kzU0rNIfsBRPzIFfxC3W21nCyCKvBzpgcFf2BpH4V2RG0Vv1Eu7OAb TF4kMN+ATv9RBzRxMqh4vneERw5hRGuecGEZyHLaxCdrrT7Z+OFXbPiGFG3+nQ8gDb9wHI Vf5GjIhlKiUirRkfNhBWROp7n1qVd5jLZJT5JYU4FJQs4T9P+hOSnQPDrwOcMQ== 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 4NbCDK6tPFzpY2; Mon, 19 Dec 2022 08:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BJ8EfR6053044; Mon, 19 Dec 2022 08:14:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BJ8Ef4a053043; Mon, 19 Dec 2022 08:14:41 GMT (envelope-from git) Date: Mon, 19 Dec 2022 08:14:41 GMT Message-Id: <202212190814.2BJ8Ef4a053043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 56da4aa5545f - main - vfs: stop using SAVESTART for rename 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56da4aa5545f9fa968f1d924d01db8939c401c15 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=56da4aa5545f9fa968f1d924d01db8939c401c15 commit 56da4aa5545f9fa968f1d924d01db8939c401c15 Author: Mateusz Guzik AuthorDate: 2022-12-14 09:34:53 +0000 Commit: Mateusz Guzik CommitDate: 2022-12-19 08:09:37 +0000 vfs: stop using SAVESTART for rename ni_startdir has never reached rename routines anyway Reviewed by: mckusick Tested by: pho Differential Revision: https://reviews.freebsd.org/D34468 --- sys/fs/msdosfs/msdosfs_vnops.c | 2 -- sys/kern/vfs_syscalls.c | 16 ++++------------ sys/ufs/ufs/ufs_vnops.c | 2 -- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 8fb58a58b138..9084c1829acc 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1127,8 +1127,6 @@ relock: } if (error != 0) goto unlock; - if ((tcnp->cn_flags & SAVESTART) == 0) - panic("msdosfs_rename: lost to startdir"); } if (tip != NULL) { diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index b3223e620962..fa5888ad836c 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3637,8 +3637,8 @@ kern_renameat_mac(struct thread *td, int oldfd, const char *old, int newfd, { int error; - NDINIT_ATRIGHTS(fromnd, DELETE, LOCKPARENT | LOCKLEAF | SAVESTART | - AUDITVNODE1, pathseg, old, oldfd, &cap_renameat_source_rights); + NDINIT_ATRIGHTS(fromnd, DELETE, LOCKPARENT | LOCKLEAF | AUDITVNODE1, + pathseg, old, oldfd, &cap_renameat_source_rights); if ((error = namei(fromnd)) != 0) return (error); error = mac_vnode_check_rename_from(td->td_ucred, fromnd->ni_dvp, @@ -3650,8 +3650,6 @@ kern_renameat_mac(struct thread *td, int oldfd, const char *old, int newfd, NDFREE_PNBUF(fromnd); vrele(fromnd->ni_dvp); vrele(fromnd->ni_vp); - if (fromnd->ni_startdir) - vrele(fromnd->ni_startdir); } return (error); } @@ -3677,7 +3675,7 @@ again: return (error); } else { #endif - NDINIT_ATRIGHTS(&fromnd, DELETE, WANTPARENT | SAVESTART | AUDITVNODE1, + NDINIT_ATRIGHTS(&fromnd, DELETE, WANTPARENT | AUDITVNODE1, pathseg, old, oldfd, &cap_renameat_source_rights); if ((error = namei(&fromnd)) != 0) return (error); @@ -3685,7 +3683,7 @@ again: } #endif fvp = fromnd.ni_vp; - tondflags = LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | AUDITVNODE2; + tondflags = LOCKPARENT | LOCKLEAF | NOCACHE | AUDITVNODE2; if (fromnd.ni_vp->v_type == VDIR) tondflags |= WILLBEDIR; NDINIT_ATRIGHTS(&tond, RENAME, tondflags, pathseg, new, newfd, @@ -3713,9 +3711,6 @@ again: vput(tdvp); vrele(fromnd.ni_dvp); vrele(fvp); - vrele(tond.ni_startdir); - if (fromnd.ni_startdir != NULL) - vrele(fromnd.ni_startdir); error = vn_start_write(NULL, &mp, V_XSLEEP | V_PCATCH); if (error != 0) return (error); @@ -3775,11 +3770,8 @@ out: vrele(fromnd.ni_dvp); vrele(fvp); } - vrele(tond.ni_startdir); vn_finished_write(mp); out1: - if (fromnd.ni_startdir) - vrele(fromnd.ni_startdir); if (error == ERESTART) return (0); if (error == ERELOOKUP) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 9ea38bc149a5..ecb8cb6900ca 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1510,8 +1510,6 @@ relock: } if (error) goto unlockout; - if ((tcnp->cn_flags & SAVESTART) == 0) - panic("ufs_rename: lost to startdir"); } if (fip->i_effnlink == 0 || fdp->i_effnlink == 0 || tdp->i_effnlink == 0)