diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2018-06-07 13:37:29 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2018-06-07 13:37:29 +0000 |
| commit | 380a152a55a793d5891fd063c5856fe955061263 (patch) | |
| tree | 2a642715663fa28e52eb1702f889ef1cf10d584f /sys/tmpfs/tmpfs_vnops.c | |
| parent | fad718c914c60261c1c08c7123d69239f348d8ae (diff) | |
Make callers of VOP_CREATE(9) and VOP_MKNOD(9) responsible for
unlocking the directory vnode.
OK mpi@, helg@
Diffstat (limited to 'sys/tmpfs/tmpfs_vnops.c')
| -rw-r--r-- | sys/tmpfs/tmpfs_vnops.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sys/tmpfs/tmpfs_vnops.c b/sys/tmpfs/tmpfs_vnops.c index 5c06b4b788b..6615a1951bd 100644 --- a/sys/tmpfs/tmpfs_vnops.c +++ b/sys/tmpfs/tmpfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmpfs_vnops.c,v 1.31 2018/05/28 16:02:08 visa Exp $ */ +/* $OpenBSD: tmpfs_vnops.c,v 1.32 2018/06/07 13:37:28 visa Exp $ */ /* $NetBSD: tmpfs_vnops.c,v 1.100 2012/11/05 17:27:39 dholland Exp $ */ /* @@ -317,14 +317,11 @@ tmpfs_create(void *v) struct vnode *dvp = ap->a_dvp, **vpp = ap->a_vpp; struct componentname *cnp = ap->a_cnp; struct vattr *vap = ap->a_vap; - int error; KASSERT(VOP_ISLOCKED(dvp)); KASSERT(cnp->cn_flags & HASBUF); KASSERT(vap->va_type == VREG || vap->va_type == VSOCK); - error = tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL); - vput(dvp); - return error; + return tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL); } int @@ -342,20 +339,15 @@ tmpfs_mknod(void *v) enum vtype vt = vap->va_type; int error; - if (vt != VBLK && vt != VCHR && vt != VFIFO) { - vput(dvp); + if (vt != VBLK && vt != VCHR && vt != VFIFO) return EINVAL; - } - /* tmpfs_alloc_file() will unlock 'dvp'. */ error = tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL); - vput(dvp); - if (error) - return error; - vput(*vpp); + if (error == 0) + vput(*vpp); - return 0; + return error; } int |