Revert rev 1.259. The null-pointer function call (a dereference on
ia64) was not the result of a change in the vector operations. It was caused by the NFS locking code using a FIFO and those bypassing the vnode. This indirectly caused the panic. The NFS locking code has been changed. Requested by: phk
This commit is contained in:
parent
9effe51e45
commit
d3ecc7aa52
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=138701
@ -696,45 +696,6 @@ extern struct vop_vector default_vnodeops;
|
||||
#define VOP_EINVAL ((void*)(uintptr_t)vop_einval)
|
||||
#define VOP_EOPNOTSUPP ((void*)(uintptr_t)vop_eopnotsupp)
|
||||
|
||||
struct vop_close_args;
|
||||
static __inline int
|
||||
vop_close(struct vop_vector *vp, struct vop_close_args *ap)
|
||||
{
|
||||
|
||||
while (vp != NULL && vp->vop_close == NULL)
|
||||
vp = vp->vop_default;
|
||||
return ((vp != NULL) ? vp->vop_close(ap) : EOPNOTSUPP);
|
||||
}
|
||||
|
||||
struct vop_kqfilter_args;
|
||||
static __inline int
|
||||
vop_kqfilter(struct vop_vector *vp, struct vop_kqfilter_args *ap)
|
||||
{
|
||||
|
||||
while (vp != NULL && vp->vop_kqfilter == NULL)
|
||||
vp = vp->vop_default;
|
||||
return ((vp != NULL) ? vp->vop_kqfilter(ap) : EOPNOTSUPP);
|
||||
}
|
||||
|
||||
struct vop_read_args;
|
||||
static __inline int
|
||||
vop_read(struct vop_vector *vp, struct vop_read_args *ap)
|
||||
{
|
||||
|
||||
while (vp != NULL && vp->vop_read == NULL)
|
||||
vp = vp->vop_default;
|
||||
return ((vp != NULL) ? vp->vop_read(ap) : EOPNOTSUPP);
|
||||
}
|
||||
|
||||
struct vop_write_args;
|
||||
static __inline int
|
||||
vop_write(struct vop_vector *vp, struct vop_write_args *ap)
|
||||
{
|
||||
|
||||
while (vp != NULL && vp->vop_write == NULL)
|
||||
vp = vp->vop_default;
|
||||
return ((vp != NULL) ? vp->vop_write(ap) : EOPNOTSUPP);
|
||||
}
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user