diff options
author | Visa Hankala <visa@cvs.openbsd.org> | 2018-03-28 16:34:29 +0000 |
---|---|---|
committer | Visa Hankala <visa@cvs.openbsd.org> | 2018-03-28 16:34:29 +0000 |
commit | d82c10bbb5384161b394e36d30ed62e23e9a83ef (patch) | |
tree | 4102e5df4c1e9b38c3a0fdb59cbb4b649e1d7c77 /sys/isofs | |
parent | df2b8b0f026cb3aff865f35fa3ee244f273835b4 (diff) |
Use RWL_IS_VNODE with locks that are acquired through VOP_LOCK(),
to appease WITNESS. ext2fs and ffs already use the flag. The same
locking pattern appears with other file systems too, so this patch
addresses the remaining cases.
OK mpi@
Diffstat (limited to 'sys/isofs')
-rw-r--r-- | sys/isofs/cd9660/cd9660_vfsops.c | 4 | ||||
-rw-r--r-- | sys/isofs/udf/udf_vfsops.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index ac3df59ad1b..be84d998b74 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vfsops.c,v 1.87 2018/02/10 05:24:23 deraadt Exp $ */ +/* $OpenBSD: cd9660_vfsops.c,v 1.88 2018/03/28 16:34:28 visa Exp $ */ /* $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $ */ /*- @@ -755,7 +755,7 @@ retry: return (error); } ip = malloc(sizeof(*ip), M_ISOFSNODE, M_WAITOK | M_ZERO); - rrw_init_flags(&ip->i_lock, "isoinode", RWL_DUPOK); + rrw_init_flags(&ip->i_lock, "isoinode", RWL_DUPOK | RWL_IS_VNODE); vp->v_data = ip; ip->i_vnode = vp; ip->i_dev = dev; diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c index 8a0173db611..7e917a7fe86 100644 --- a/sys/isofs/udf/udf_vfsops.c +++ b/sys/isofs/udf/udf_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_vfsops.c,v 1.62 2018/02/10 05:24:23 deraadt Exp $ */ +/* $OpenBSD: udf_vfsops.c,v 1.63 2018/03/28 16:34:28 visa Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -638,7 +638,7 @@ udf_vget(struct mount *mp, ino_t ino, struct vnode **vpp) vp->v_data = up; vref(ump->um_devvp); - rrw_init_flags(&up->u_lock, "unode", RWL_DUPOK); + rrw_init_flags(&up->u_lock, "unode", RWL_DUPOK | RWL_IS_VNODE); /* * udf_hashins() will lock the vnode for us. |