From 10a15df653a73e8087d582dd48fbf62afa3a5d15 Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Sun, 2 Feb 2020 09:35:48 +0000 Subject: [PATCH] vfs: remove the never set VDESC_VPP_WILLRELE flag --- sys/fs/nullfs/null_vnops.c | 3 --- sys/sys/vnode.h | 1 - 2 files changed, 4 deletions(-) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 60d1e854df72..4dd555a18dbe 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -317,15 +317,12 @@ null_bypass(struct vop_generic_args *ap) * We must avoid these ops. * (This should go away when these ops are regularized.) */ - if (descp->vdesc_flags & VDESC_VPP_WILLRELE) - goto out; vppp = VOPARG_OFFSETTO(struct vnode***, descp->vdesc_vpp_offset,ap); if (*vppp) error = null_nodeget(old_vps[0]->v_mount, **vppp, *vppp); } - out: return (error); } diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 8d983ca8a838..204fafd984c4 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -463,7 +463,6 @@ extern struct vattr va_null; /* predefined null vattr structure */ #define VDESC_VP1_WILLRELE 0x0002 #define VDESC_VP2_WILLRELE 0x0004 #define VDESC_VP3_WILLRELE 0x0008 -#define VDESC_VPP_WILLRELE 0x0200 /* * A generic structure.