From nobody Fri Apr 15 13:57:04 2022 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 15D358D25D7; Fri, 15 Apr 2022 13:57:05 +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 4KfyYs01Nmz50KF; Fri, 15 Apr 2022 13:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650031025; 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=t9T9Ye3xkJnAKfKPfIUbxU44u2ee4aaSMMqkI2YmVRY=; b=J/HT8bsMpBAIXvUC5dF+pKEjS8jbaloHQ65bwglFpwSVpW27rIPlJgRHhmohBI5mR+etBc rjeHOb0Luy3txhYXPDRvQZ/4HiYxhBVjQuv65xvglXanrEjeRU+XDDSI2ICjaqf7pv+zed M5BPvxd2tB21CJ8KM82jphpYTxcG3K/KrugGB55CmhkCZF1vL9fYbzPurJRqiLJelXbinx 1iaxpdQlX4nixROLMqm9+Aggf85MDKtmiJ9W25sgwGg2vD4BRxsOnmLkwAt1vRUJXMBcm4 y8Kbzds11f05FXP5PWbctiHvCnUU1fo56//6UZLJn2mIq3sliJ9milVAdaBa/g== 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 D5151163F6; Fri, 15 Apr 2022 13:57:04 +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 23FDv4pi022323; Fri, 15 Apr 2022 13:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23FDv4gr022322; Fri, 15 Apr 2022 13:57:04 GMT (envelope-from git) Date: Fri, 15 Apr 2022 13:57:04 GMT Message-Id: <202204151357.23FDv4gr022322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 362ff9867e9f - main - Revert rest of a5970a529c2d95271: use vrefact() when working on fp->f_vnode 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 362ff9867e9f0856a0f24f91e5fc6b9b3ecff8e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650031025; 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=t9T9Ye3xkJnAKfKPfIUbxU44u2ee4aaSMMqkI2YmVRY=; b=Hy7dGS/kgvOHynJzKnAxcEFY9fl+bPNhxJwLYXQT9JVUQtIci6qX9kxNtR2udgattiUUVO MvBfEmto/1mypWzMLb0WIFOmkJ9WTQubR5I7syR7pdip3/ed6D1YzF0AjMjINGNpJrX84G 1fiEo0ehx3L/1m0WMmzMR9z71OnTVIhynYkWHz8IlS+Td7FWPP9kE5hBZFUKWdRmTx8CV2 xPOdwfzmRH5/WU507oyiLqUWVLn0Osujc5jGlogYbCR6T6g24fkOMehZECiodkVy28sM50 Na0xaQKJt+8lFW2QXuQmAAJ0I3XTQ+t8BLomk5UG4u+uDG+oXt8JGIfr3TKHjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650031025; a=rsa-sha256; cv=none; b=jS5ze1VEv8605ECEJOyFGv3dd8I1JQy5MUBcLb74vlqWc+4rvLRiAHz+c1j3oE5G9f1C4Y yzjTuRi+aMfh1H6579HhKlo69UAkqXsUpCL37zsqxV34cqeQ/lGCJ1FJj6TNSSe23q07H3 uL9rLkfWSHhzWUOqRQen3pz4nAuPDBdeCpkWcu88ZqySA8KZUzlDjaD+qGh+kq81AXosdS UQctGalNno8rBEtOQsPgj5ojy+52OO8yq7Mx72c0P1xHr1+GWqSR44yfNCfSvkqR/j/PPC ylXSz/dKgGTFmkkv1B2xcgsAPwnEgB+alfGkgVImlBBeU5qfk0/A2BfiY3jNRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=362ff9867e9f0856a0f24f91e5fc6b9b3ecff8e9 commit 362ff9867e9f0856a0f24f91e5fc6b9b3ecff8e9 Author: Konstantin Belousov AuthorDate: 2022-04-13 23:39:57 +0000 Commit: Konstantin Belousov CommitDate: 2022-04-15 13:56:20 +0000 Revert rest of a5970a529c2d95271: use vrefact() when working on fp->f_vnode Now, since O_PATH-opened file descriptors use use references instead of the hold references, vrefact() chahges from that revision can be reverted. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34906 --- sys/kern/kern_descrip.c | 6 +++--- sys/kern/vfs_syscalls.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 740d777bcede..163864ddf752 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3087,7 +3087,7 @@ fgetvp_lookup(int fd, struct nameidata *ndp, struct vnode **vpp) error = ENOTDIR; goto out_free; } - vref(vp); + vrefact(vp); /* * XXX does not check for VDIR, handled by namei_setup */ @@ -3537,7 +3537,7 @@ _fgetvp(struct thread *td, int fd, int flags, cap_rights_t *needrightsp, error = EINVAL; } else { *vpp = fp->f_vnode; - vref(*vpp); + vrefact(*vpp); } fdrop(fp, td); @@ -3573,7 +3573,7 @@ fgetvp_rights(struct thread *td, int fd, cap_rights_t *needrightsp, *havecaps = caps; *vpp = fp->f_vnode; - vref(*vpp); + vrefact(*vpp); fdrop(fp, td); return (0); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index a41a12d08cf9..ccc14bdc0382 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -907,7 +907,7 @@ sys_fchdir(struct thread *td, struct fchdir_args *uap) if (error != 0) return (error); vp = fp->f_vnode; - vref(vp); + vrefact(vp); fdrop(fp, td); vn_lock(vp, LK_SHARED | LK_RETRY); AUDIT_ARG_VNODE1(vp);