diff --git a/sys/fs/tmpfs/tmpfs_rename.c b/sys/fs/tmpfs/tmpfs_rename.c
index 905f86fe8b10..583ee3131a15 100644
--- a/sys/fs/tmpfs/tmpfs_rename.c
+++ b/sys/fs/tmpfs/tmpfs_rename.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tmpfs_rename.c,v 1.9 2019/07/14 05:58:44 maxv Exp $	*/
+/*	$NetBSD: tmpfs_rename.c,v 1.10 2019/12/03 04:59:05 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_rename.c,v 1.9 2019/07/14 05:58:44 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_rename.c,v 1.10 2019/12/03 04:59:05 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -425,7 +425,7 @@ tmpfs_gro_lookup(struct mount *mp, struct vnode *dvp,
 {
 	struct tmpfs_dirent *dirent, **dep_ret = de_ret;
 	struct vnode *vp;
-	int error __diagused;
+	int error;
 
 	(void)mp;
 	KASSERT(mp != NULL);
@@ -444,11 +444,6 @@ tmpfs_gro_lookup(struct mount *mp, struct vnode *dvp,
 		return error;
 	KASSERT(vp != NULL);
 
-	/*
-	 * XXX Once namei is fixed, we can change the genfs_rename
-	 * protocol so that we have to lock vp here.
-	 */
-
 	*dep_ret = dirent;
 	*vp_ret = vp;
 	return 0;