| nfs_lock.c (168931) | nfs_lock.c (177633) |
|---|---|
| 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 168931 2007-04-21 18:11:19Z rwatson $"); | 32__FBSDID("$FreeBSD: head/sys/nfsclient/nfs_lock.c 177633 2008-03-26 15:23:12Z dfr $"); |
| 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/conf.h> 37#include <sys/fcntl.h> 38#include <sys/kernel.h> /* for hz */ 39#include <sys/limits.h> 40#include <sys/lock.h> --- 278 unchanged lines hidden (view full) --- 319 continue; 320 } 321 322 break; 323 } 324 325 if (msg.lm_getlk && p->p_nlminfo->retcode == 0) { 326 if (p->p_nlminfo->set_getlk_pid) { | 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/conf.h> 37#include <sys/fcntl.h> 38#include <sys/kernel.h> /* for hz */ 39#include <sys/limits.h> 40#include <sys/lock.h> --- 278 unchanged lines hidden (view full) --- 319 continue; 320 } 321 322 break; 323 } 324 325 if (msg.lm_getlk && p->p_nlminfo->retcode == 0) { 326 if (p->p_nlminfo->set_getlk_pid) { |
| 327 fl->l_sysid = 0; /* XXX */ |
|
| 327 fl->l_pid = p->p_nlminfo->getlk_pid; 328 } else { 329 fl->l_type = F_UNLCK; 330 } 331 } 332 error = p->p_nlminfo->retcode; 333 break; 334 } --- 54 unchanged lines hidden --- | 328 fl->l_pid = p->p_nlminfo->getlk_pid; 329 } else { 330 fl->l_type = F_UNLCK; 331 } 332 } 333 error = p->p_nlminfo->retcode; 334 break; 335 } --- 54 unchanged lines hidden --- |