From owner-svn-src-all@freebsd.org Tue Oct 20 09:46:21 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 39FC042BA56; Tue, 20 Oct 2020 09:46:21 +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) 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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CFpfj0tF8z457J; Tue, 20 Oct 2020 09:46:21 +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 F181E132AB; Tue, 20 Oct 2020 09:46:20 +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 09K9kKl0067579; Tue, 20 Oct 2020 09:46:20 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09K9kKxS067577; Tue, 20 Oct 2020 09:46:20 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202010200946.09K9kKxS067577@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 20 Oct 2020 09:46:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366890 - head/sys/ufs/ufs X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/ufs/ufs X-SVN-Commit-Revision: 366890 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.33 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: Tue, 20 Oct 2020 09:46:21 -0000 Author: mjg Date: Tue Oct 20 09:46:20 2020 New Revision: 366890 URL: https://svnweb.freebsd.org/changeset/base/366890 Log: ufs: catch up with removal of thread argument from VOP_INACTIVE Modified: head/sys/ufs/ufs/extattr.h head/sys/ufs/ufs/ufs_extattr.c head/sys/ufs/ufs/ufs_inode.c Modified: head/sys/ufs/ufs/extattr.h ============================================================================== --- head/sys/ufs/ufs/extattr.h Tue Oct 20 08:40:39 2020 (r366889) +++ head/sys/ufs/ufs/extattr.h Tue Oct 20 09:46:20 2020 (r366890) @@ -140,7 +140,7 @@ int ufs_extattrctl(struct mount *mp, int cmd, struct v int ufs_getextattr(struct vop_getextattr_args *ap); int ufs_deleteextattr(struct vop_deleteextattr_args *ap); int ufs_setextattr(struct vop_setextattr_args *ap); -void ufs_extattr_vnode_inactive(struct vnode *vp, struct thread *td); +void ufs_extattr_vnode_inactive(struct vnode *vp); #endif /* !_KERNEL */ Modified: head/sys/ufs/ufs/ufs_extattr.c ============================================================================== --- head/sys/ufs/ufs/ufs_extattr.c Tue Oct 20 08:40:39 2020 (r366889) +++ head/sys/ufs/ufs/ufs_extattr.c Tue Oct 20 09:46:20 2020 (r366890) @@ -1276,7 +1276,7 @@ vopunlock_exit: * attributes stripped. */ void -ufs_extattr_vnode_inactive(struct vnode *vp, struct thread *td) +ufs_extattr_vnode_inactive(struct vnode *vp) { struct ufs_extattr_list_entry *uele; struct mount *mp = vp->v_mount; @@ -1299,7 +1299,7 @@ ufs_extattr_vnode_inactive(struct vnode *vp, struct th LIST_FOREACH(uele, &ump->um_extattr.uepm_list, uele_entries) ufs_extattr_rm(vp, uele->uele_attrnamespace, - uele->uele_attrname, NULL, td); + uele->uele_attrname, NULL, curthread); ufs_extattr_uepm_unlock(ump); } Modified: head/sys/ufs/ufs/ufs_inode.c ============================================================================== --- head/sys/ufs/ufs/ufs_inode.c Tue Oct 20 08:40:39 2020 (r366889) +++ head/sys/ufs/ufs/ufs_inode.c Tue Oct 20 09:46:20 2020 (r366890) @@ -106,7 +106,6 @@ int ufs_inactive(ap) struct vop_inactive_args /* { struct vnode *a_vp; - struct thread *a_td; } */ *ap; { struct vnode *vp = ap->a_vp; @@ -173,7 +172,7 @@ ufs_inactive(ap) (void)chkiq(ip, -1, NOCRED, FORCE); #endif #ifdef UFS_EXTATTR - ufs_extattr_vnode_inactive(vp, ap->a_td); + ufs_extattr_vnode_inactive(vp); #endif /* * Setting the mode to zero needs to wait for the inode