| fifo_vnops.c (109623) | fifo_vnops.c (111119) |
|---|---|
| 1/* 2 * Copyright (c) 1990, 1993, 1995 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 | 1/* 2 * Copyright (c) 1990, 1993, 1995 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 |
| 34 * $FreeBSD: head/sys/fs/fifofs/fifo_vnops.c 109623 2003-01-21 08:56:16Z alfred $ | 34 * $FreeBSD: head/sys/fs/fifofs/fifo_vnops.c 111119 2003-02-19 05:47:46Z imp $ |
| 35 */ 36 37#include <sys/param.h> 38#include <sys/event.h> 39#include <sys/filio.h> 40#include <sys/fcntl.h> 41#include <sys/file.h> 42#include <sys/kernel.h> --- 126 unchanged lines hidden (view full) --- 169{ 170 struct vnode *vp = ap->a_vp; 171 struct fifoinfo *fip; 172 struct thread *td = ap->a_td; 173 struct socket *rso, *wso; 174 int error; 175 176 if ((fip = vp->v_fifoinfo) == NULL) { | 35 */ 36 37#include <sys/param.h> 38#include <sys/event.h> 39#include <sys/filio.h> 40#include <sys/fcntl.h> 41#include <sys/file.h> 42#include <sys/kernel.h> --- 126 unchanged lines hidden (view full) --- 169{ 170 struct vnode *vp = ap->a_vp; 171 struct fifoinfo *fip; 172 struct thread *td = ap->a_td; 173 struct socket *rso, *wso; 174 int error; 175 176 if ((fip = vp->v_fifoinfo) == NULL) { |
| 177 MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, 0); | 177 MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, M_WAITOK); |
| 178 vp->v_fifoinfo = fip; 179 error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0, 180 ap->a_td->td_ucred, ap->a_td); 181 if (error) { 182 free(fip, M_VNODE); 183 vp->v_fifoinfo = NULL; 184 return (error); 185 } --- 436 unchanged lines hidden --- | 178 vp->v_fifoinfo = fip; 179 error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0, 180 ap->a_td->td_ucred, ap->a_td); 181 if (error) { 182 free(fip, M_VNODE); 183 vp->v_fifoinfo = NULL; 184 return (error); 185 } --- 436 unchanged lines hidden --- |