nfs_lock.c (107104) | nfs_lock.c (109623) |
---|---|
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 107104 2002-11-20 15:21:06Z alfred $"); | 32__FBSDID("$FreeBSD: head/sys/nfsclient/nfs_lock.c 109623 2003-01-21 08:56:16Z alfred $"); |
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/lock.h> 39#include <sys/malloc.h> 40#include <sys/lockf.h> /* for hz */ /* Must come after sys/malloc.h */ --- 68 unchanged lines hidden (view full) --- 109 */ 110 msg.lm_version = LOCKD_MSG_VERSION; 111 msg.lm_msg_ident.pid = p->p_pid; 112 /* 113 * if there is no nfsowner table yet, allocate one. 114 */ 115 if (p->p_nlminfo == NULL) { 116 MALLOC(p->p_nlminfo, struct nlminfo *, | 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/lock.h> 39#include <sys/malloc.h> 40#include <sys/lockf.h> /* for hz */ /* Must come after sys/malloc.h */ --- 68 unchanged lines hidden (view full) --- 109 */ 110 msg.lm_version = LOCKD_MSG_VERSION; 111 msg.lm_msg_ident.pid = p->p_pid; 112 /* 113 * if there is no nfsowner table yet, allocate one. 114 */ 115 if (p->p_nlminfo == NULL) { 116 MALLOC(p->p_nlminfo, struct nlminfo *, |
117 sizeof(struct nlminfo), M_LOCKF, M_WAITOK | M_ZERO); | 117 sizeof(struct nlminfo), M_LOCKF, M_ZERO); |
118 p->p_nlminfo->pid_start = p->p_stats->p_start; 119 } 120 msg.lm_msg_ident.pid_start = p->p_nlminfo->pid_start; 121 msg.lm_msg_ident.msg_seq = ++(p->p_nlminfo->msg_seq); 122 123 msg.lm_fl = *fl; 124 msg.lm_wait = ap->a_flags & F_WAIT; 125 msg.lm_getlk = ap->a_op == F_GETLK; --- 140 unchanged lines hidden --- | 118 p->p_nlminfo->pid_start = p->p_stats->p_start; 119 } 120 msg.lm_msg_ident.pid_start = p->p_nlminfo->pid_start; 121 msg.lm_msg_ident.msg_seq = ++(p->p_nlminfo->msg_seq); 122 123 msg.lm_fl = *fl; 124 msg.lm_wait = ap->a_flags & F_WAIT; 125 msg.lm_getlk = ap->a_op == F_GETLK; --- 140 unchanged lines hidden --- |