FreeBSD: Catch up with more VFS changes

Unused thread argument was removed from NDINIT* https://cgit.freebsd.org/src/commit?id=7e1d3eefd410ca0fbae5a217422821244c3eeee4 Signed-off-by: Ryan Moeller <[email protected]>
openzfs · Dec 9, 2021 · 4750fe2 · 4750fe2
1 parent 510885a
commit 4750fe2
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -5344,7 +5344,11 @@ zfs_getextattr_dir(struct vop_getextattr_args *ap, const char *attrname)
 
 	flags = FREAD;
 	NDINIT_ATVP(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, attrname,
+#if __FreeBSD_version < 1400043
 	    xvp, td);
+#else
+	    xvp);
+#endif
 	error = vn_open_cred(&nd, &flags, 0, VN_OPEN_INVFS, ap->a_cred, NULL);
 	vp = nd.ni_vp;
 	NDFREE(&nd, NDF_ONLY_PNBUF);
@@ -5458,7 +5462,11 @@ zfs_deleteextattr_dir(struct vop_deleteextattr_args *ap, const char *attrname)
 		return (error);
 
 	NDINIT_ATVP(&nd, DELETE, NOFOLLOW | LOCKPARENT | LOCKLEAF,
+#if __FreeBSD_version < 1400043
 	    UIO_SYSSPACE, attrname, xvp, ap->a_td);
+#else
+	    UIO_SYSSPACE, attrname, xvp);
+#endif
 	error = namei(&nd);
 	vp = nd.ni_vp;
 	if (error != 0) {
@@ -5586,7 +5594,11 @@ zfs_setextattr_dir(struct vop_setextattr_args *ap, const char *attrname)
 		return (error);
 
 	flags = FFLAGS(O_WRONLY | O_CREAT);
+#if __FreeBSD_version < 1400043
 	NDINIT_ATVP(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, attrname, xvp, td);
+#else
+	NDINIT_ATVP(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, attrname, xvp);
+#endif
 	error = vn_open_cred(&nd, &flags, 0600, VN_OPEN_INVFS, ap->a_cred,
 	    NULL);
 	vp = nd.ni_vp;
@@ -5742,7 +5754,11 @@ zfs_listextattr_dir(struct vop_listextattr_args *ap, const char *attrprefix)
 	}
 
 	NDINIT_ATVP(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED,
+#if __FreeBSD_version < 1400043
 	    UIO_SYSSPACE, ".", xvp, td);
+#else
+	    UIO_SYSSPACE, ".", xvp);
+#endif
 	error = namei(&nd);
 	vp = nd.ni_vp;
 	NDFREE(&nd, NDF_ONLY_PNBUF);