Deleted Added
full compact
nfs_lock.c (112685) nfs_lock.c (114216)
1/*-
2 * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * from BSDI nfs_lock.c,v 2.4 1998/12/14 23:49:56 jch Exp
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * from BSDI nfs_lock.c,v 2.4 1998/12/14 23:49:56 jch Exp
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sys/nfsclient/nfs_lock.c 112685 2003-03-26 19:21:34Z rwatson $");
32__FBSDID("$FreeBSD: head/sys/nfsclient/nfs_lock.c 114216 2003-04-29 13:36:06Z kan $");
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/fcntl.h>
37#include <sys/kernel.h> /* for hz */
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/fcntl.h>
37#include <sys/kernel.h> /* for hz */
38#include <sys/limits.h>
38#include <sys/lock.h>
39#include <sys/malloc.h>
40#include <sys/lockf.h> /* for hz */ /* Must come after sys/malloc.h */
41#include <sys/mbuf.h>
42#include <sys/mount.h>
43#include <sys/namei.h>
44#include <sys/proc.h>
45#include <sys/resourcevar.h>
46#include <sys/socket.h>
47#include <sys/socket.h>
48#include <sys/unistd.h>
49#include <sys/vnode.h>
50
39#include <sys/lock.h>
40#include <sys/malloc.h>
41#include <sys/lockf.h> /* for hz */ /* Must come after sys/malloc.h */
42#include <sys/mbuf.h>
43#include <sys/mount.h>
44#include <sys/namei.h>
45#include <sys/proc.h>
46#include <sys/resourcevar.h>
47#include <sys/socket.h>
48#include <sys/socket.h>
49#include <sys/unistd.h>
50#include <sys/vnode.h>
51
51#include <machine/limits.h>
52
53#include <net/if.h>
54
55#include <nfs/rpcv2.h>
56#include <nfs/nfsproto.h>
57#include <nfsclient/nfs.h>
58#include <nfsclient/nfsmount.h>
59#include <nfsclient/nfsnode.h>
60#include <nfsclient/nfs_lock.h>

--- 215 unchanged lines hidden ---
52#include <net/if.h>
53
54#include <nfs/rpcv2.h>
55#include <nfs/nfsproto.h>
56#include <nfsclient/nfs.h>
57#include <nfsclient/nfsmount.h>
58#include <nfsclient/nfsnode.h>
59#include <nfsclient/nfs_lock.h>

--- 215 unchanged lines hidden ---