From owner-svn-src-all@freebsd.org Sun Jan 5 00:59:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1AA041ECA71; Sun, 5 Jan 2020 00:59:48 +0000 (UTC) (envelope-from mjg@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47r0fW6rcHz4rL5; Sun, 5 Jan 2020 00:59:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E63A31D8D8; Sun, 5 Jan 2020 00:59:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0050xlcP031333; Sun, 5 Jan 2020 00:59:47 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0050xlfe031331; Sun, 5 Jan 2020 00:59:47 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202001050059.0050xlfe031331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 5 Jan 2020 00:59:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356363 - in head/sys: kern sys ufs/ffs X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: kern sys ufs/ffs X-SVN-Commit-Revision: 356363 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jan 2020 00:59:48 -0000 Author: mjg Date: Sun Jan 5 00:59:47 2020 New Revision: 356363 URL: https://svnweb.freebsd.org/changeset/base/356363 Log: vfs: drop thread argument from vinactive Modified: head/sys/kern/vfs_subr.c head/sys/sys/vnode.h head/sys/ufs/ffs/ffs_snapshot.c Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Sun Jan 5 00:59:16 2020 (r356362) +++ head/sys/kern/vfs_subr.c Sun Jan 5 00:59:47 2020 (r356363) @@ -2895,7 +2895,7 @@ vget_finish(struct vnode *vp, int flags, enum vgetstat refcount_acquire(&vp->v_usecount); if (oweinact && VOP_ISLOCKED(vp) == LK_EXCLUSIVE && (flags & LK_NOWAIT) == 0) - vinactive(vp, curthread); + vinactive(vp); VI_UNLOCK(vp); return (0); } @@ -3061,7 +3061,7 @@ vputx(struct vnode *vp, enum vputx_op func) ("vnode with usecount and VI_OWEINACT set")); if (error == 0) { if (vp->v_iflag & VI_OWEINACT) - vinactive(vp, curthread); + vinactive(vp); if (func != VPUTX_VUNREF) VOP_UNLOCK(vp); } @@ -3280,7 +3280,7 @@ vdropl(struct vnode *vp) * failed lock upgrade. */ void -vinactive(struct vnode *vp, struct thread *td) +vinactive(struct vnode *vp) { struct vm_object *obj; @@ -3308,7 +3308,7 @@ vinactive(struct vnode *vp, struct thread *td) vm_object_page_clean(obj, 0, 0, 0); VM_OBJECT_WUNLOCK(obj); } - VOP_INACTIVE(vp, td); + VOP_INACTIVE(vp, curthread); VI_LOCK(vp); VNASSERT(vp->v_iflag & VI_DOINGINACT, vp, ("vinactive: lost VI_DOINGINACT")); @@ -3604,7 +3604,7 @@ vgonel(struct vnode *vp) if (oweinact || active) { VI_LOCK(vp); if ((vp->v_iflag & VI_DOINGINACT) == 0) - vinactive(vp, td); + vinactive(vp); VI_UNLOCK(vp); } if (vp->v_type == VSOCK) Modified: head/sys/sys/vnode.h ============================================================================== --- head/sys/sys/vnode.h Sun Jan 5 00:59:16 2020 (r356362) +++ head/sys/sys/vnode.h Sun Jan 5 00:59:47 2020 (r356363) @@ -663,7 +663,7 @@ void vgone(struct vnode *vp); void vhold(struct vnode *); void vholdl(struct vnode *); void vholdnz(struct vnode *); -void vinactive(struct vnode *, struct thread *); +void vinactive(struct vnode *vp); int vinvalbuf(struct vnode *vp, int save, int slpflag, int slptimeo); int vtruncbuf(struct vnode *vp, off_t length, int blksize); void v_inval_buf_range(struct vnode *vp, daddr_t startlbn, daddr_t endlbn, Modified: head/sys/ufs/ffs/ffs_snapshot.c ============================================================================== --- head/sys/ufs/ffs/ffs_snapshot.c Sun Jan 5 00:59:16 2020 (r356362) +++ head/sys/ufs/ffs/ffs_snapshot.c Sun Jan 5 00:59:47 2020 (r356363) @@ -2552,10 +2552,8 @@ process_deferred_inactive(struct mount *mp) { struct vnode *vp, *mvp; struct inode *ip; - struct thread *td; int error; - td = curthread; (void) vn_start_secondary_write(NULL, &mp, V_WAIT); loop: MNT_VNODE_FOREACH_ALL(vp, mp, mvp) { @@ -2591,7 +2589,7 @@ process_deferred_inactive(struct mount *mp) vdrop(vp); continue; } - vinactive(vp, td); + vinactive(vp); VNASSERT((vp->v_iflag & VI_OWEINACT) == 0, vp, ("process_deferred_inactive: got VI_OWEINACT")); VI_UNLOCK(vp);