svn commit: r366890 - head/sys/ufs/ufs

[Mateusz Guzik]

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