Deleted Added
full compact
vfs_syscalls.c (49400) vfs_syscalls.c (49413)
1/*
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 * (c) UNIX System Laboratories, Inc.
5 * All or some portions of this file are derived from material licensed
6 * to the University of California by American Telephone and Telegraph
7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
8 * the permission of UNIX System Laboratories, Inc.

--- 22 unchanged lines hidden (view full) ---

31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
1/*
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 * (c) UNIX System Laboratories, Inc.
5 * All or some portions of this file are derived from material licensed
6 * to the University of California by American Telephone and Telegraph
7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
8 * the permission of UNIX System Laboratories, Inc.

--- 22 unchanged lines hidden (view full) ---

31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
39 * $Id: vfs_syscalls.c,v 1.127 1999/08/03 17:07:04 imp Exp $
39 * $Id: vfs_syscalls.c,v 1.128 1999/08/04 04:52:18 imp Exp $
40 */
41
42/* For 4.3 integer FS ID compatibility */
43#include "opt_compat.h"
44
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/buf.h>

--- 942 unchanged lines hidden (view full) ---

990 if (error == ERESTART)
991 error = EINTR;
992 fdp->fd_ofiles[indx] = NULL;
993 return (error);
994 }
995 p->p_dupfd = 0;
996 vp = nd.ni_vp;
997
40 */
41
42/* For 4.3 integer FS ID compatibility */
43#include "opt_compat.h"
44
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/buf.h>

--- 942 unchanged lines hidden (view full) ---

990 if (error == ERESTART)
991 error = EINTR;
992 fdp->fd_ofiles[indx] = NULL;
993 return (error);
994 }
995 p->p_dupfd = 0;
996 vp = nd.ni_vp;
997
998 fp->f_data = (caddr_t)vp;
998 fp->f_flag = flags & FMASK;
999 fp->f_flag = flags & FMASK;
999 fp->f_type = (vp->v_type == VFIFO ? DTYPE_FIFO : DTYPE_VNODE);
1000 fp->f_ops = &vnops;
1000 fp->f_ops = &vnops;
1001 fp->f_data = (caddr_t)vp;
1001 fp->f_type = (vp->v_type == VFIFO ? DTYPE_FIFO : DTYPE_VNODE);
1002 if (flags & (O_EXLOCK | O_SHLOCK)) {
1003 lf.l_whence = SEEK_SET;
1004 lf.l_start = 0;
1005 lf.l_len = 0;
1006 if (flags & O_EXLOCK)
1007 lf.l_type = F_WRLCK;
1008 else
1009 lf.l_type = F_RDLCK;

--- 2118 unchanged lines hidden ---
1002 if (flags & (O_EXLOCK | O_SHLOCK)) {
1003 lf.l_whence = SEEK_SET;
1004 lf.l_start = 0;
1005 lf.l_len = 0;
1006 if (flags & O_EXLOCK)
1007 lf.l_type = F_WRLCK;
1008 else
1009 lf.l_type = F_RDLCK;

--- 2118 unchanged lines hidden ---