svn commit: r357287 - in head/sys: fs/nullfs sys

[Mateusz Guzik]

Author: mjg
Date: Thu Jan 30 08:56:22 2020
New Revision: 357287
URL: https://svnweb.freebsd.org/changeset/base/357287

Log:
  vfs: remove the never set VDESC_NOMAP_VPP flag

Modified:
  head/sys/fs/nullfs/null_vnops.c
  head/sys/sys/vnode.h

Modified: head/sys/fs/nullfs/null_vnops.c
==============================================================================
--- head/sys/fs/nullfs/null_vnops.c	Thu Jan 30 05:37:35 2020	(r357286)
+++ head/sys/fs/nullfs/null_vnops.c	Thu Jan 30 08:56:22 2020	(r357287)
@@ -310,9 +310,7 @@ null_bypass(struct vop_generic_args *ap)
 	 * (Assumes that the lower layer always returns
 	 * a VREF'ed vpp unless it gets an error.)
 	 */
-	if (descp->vdesc_vpp_offset != VDESC_NO_OFFSET &&
-	    !(descp->vdesc_flags & VDESC_NOMAP_VPP) &&
-	    !error) {
+	if (descp->vdesc_vpp_offset != VDESC_NO_OFFSET && !error) {
 		/*
 		 * XXX - even though some ops have vpp returned vp's,
 		 * several ops actually vrele this before returning.

Modified: head/sys/sys/vnode.h
==============================================================================
--- head/sys/sys/vnode.h	Thu Jan 30 05:37:35 2020	(r357286)
+++ head/sys/sys/vnode.h	Thu Jan 30 08:56:22 2020	(r357287)
@@ -463,7 +463,6 @@ extern	struct vattr va_null;		/* predefined null vattr
 #define	VDESC_VP1_WILLRELE	0x0002
 #define	VDESC_VP2_WILLRELE	0x0004
 #define	VDESC_VP3_WILLRELE	0x0008
-#define	VDESC_NOMAP_VPP		0x0100
 #define	VDESC_VPP_WILLRELE	0x0200
 
 /*