Date: Sun, 26 Jun 2011 09:55:35 GMT From: Ilya Putsikau <ilya@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 195357 for review Message-ID: <201106260955.p5Q9tZ62012687@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@195357?ac=10 Change 195357 by ilya@ilya_triton2011 on 2011/06/26 09:55:25 Always allocate vnode with exclusive lock Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#10 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#10 (text+ko) ==== @@ -99,9 +99,9 @@ struct thread *td, uint64_t nodeid, enum vtype vtyp, - int lkflags, struct vnode **vpp) { + const int lkflags = LK_EXCLUSIVE | LK_RETRY; struct fuse_vnode_data *fvdat; struct vnode *vp2; int err = 0; @@ -124,8 +124,6 @@ return (0); } - lkflags = LK_EXCLUSIVE | LK_RETRY; /* XXXIP don't loose other flags */ - fvdat = malloc(sizeof(*fvdat), M_FUSEVN, M_WAITOK | M_ZERO); err = getnewvnode("fuse", mp, &fuse_vnops, vpp); if (err) { @@ -135,8 +133,11 @@ vn_lock(*vpp, lkflags); err = insmntque(*vpp, mp); + ASSERT_VOP_ELOCKED(*vpp, "fuse_vnode_alloc"); if (err) { + VOP_UNLOCK(*vpp, 0); free(fvdat, M_FUSEVN); + *vpp = NULL; return (err); } @@ -145,6 +146,7 @@ td, &vp2, fuse_vnode_cmp, &nodeid); if (err) { + VOP_UNLOCK(*vpp, 0); fuse_vnode_destroy(*vpp); *vpp = NULL; return (err); @@ -156,6 +158,7 @@ */ KASSERT(vp2 == NULL, ("vfs hash collision for node #%ju\n", (uintmax_t)nodeid)); + ASSERT_VOP_ELOCKED(*vpp, "fuse_vnode_alloc"); return (0); } @@ -174,7 +177,7 @@ debug_printf("dvp=%p\n", dvp); - err = fuse_vnode_alloc(mp, td, nodeid, vtyp, LK_EXCLUSIVE | LK_RETRY, vpp); + err = fuse_vnode_alloc(mp, td, nodeid, vtyp, vpp); if (err) { return err; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106260955.p5Q9tZ62012687>