diff options
| -rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index c2df25d34312..36f8357f1de4 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -154,6 +154,26 @@ fifo_lookup(ap) } /* + * Dispose of fifo resources. + * Should be called with vnode locked + */ +static void +fifo_cleanup(struct vnode *vp) +{ + struct fifoinfo *fip = vp->v_fifoinfo; + + VI_LOCK(vp); + if (vp->v_usecount == 1) { + vp->v_fifoinfo = NULL; + VI_UNLOCK(vp); + (void)soclose(fip->fi_readsock); + (void)soclose(fip->fi_writesock); + FREE(fip, M_VNODE); + } else + VI_UNLOCK(vp); +} + +/* * Open called to set up a new instance of a fifo or * to find an active instance of a fifo. */ @@ -249,6 +269,7 @@ fail1: fip->fi_readers--; if (fip->fi_readers == 0) socantsendmore(fip->fi_writesock); + fifo_cleanup(vp); return (error); } VI_LOCK(vp); @@ -268,6 +289,7 @@ fail1: fip->fi_writers--; if (fip->fi_writers == 0) socantrcvmore(fip->fi_readsock); + fifo_cleanup(vp); return (error); } /* @@ -554,15 +576,7 @@ fifo_close(ap) if (fip->fi_writers == 0) socantrcvmore(fip->fi_readsock); } - VI_LOCK(vp); - if (vp->v_usecount == 1) { - vp->v_fifoinfo = NULL; - VI_UNLOCK(vp); - (void)soclose(fip->fi_readsock); - (void)soclose(fip->fi_writesock); - FREE(fip, M_VNODE); - } else - VI_UNLOCK(vp); + fifo_cleanup(vp); VOP_UNLOCK(vp, 0, td); return (0); } |