head	1.6;
access;
symbols
	RELENG_8_4:1.6.0.2
	RELENG_9_1_0_RELEASE:1.5.2.1.4.2
	RELENG_9_1:1.5.2.1.0.4
	RELENG_9_1_BP:1.5.2.1
	RELENG_8_3_0_RELEASE:1.3.2.3.8.1
	RELENG_8_3:1.3.2.3.0.8
	RELENG_8_3_BP:1.3.2.3
	RELENG_9_0_0_RELEASE:1.5.2.1.2.1
	RELENG_9_0:1.5.2.1.0.2
	RELENG_9_0_BP:1.5.2.1
	RELENG_9:1.5.0.2
	RELENG_9_BP:1.5
	RELENG_7_4_0_RELEASE:1.1.2.3.8.1
	RELENG_8_2_0_RELEASE:1.3.2.3.6.1
	RELENG_7_4:1.1.2.3.0.8
	RELENG_7_4_BP:1.1.2.3
	RELENG_8_2:1.3.2.3.0.6
	RELENG_8_2_BP:1.3.2.3
	RELENG_8_1_0_RELEASE:1.3.2.3.4.1
	RELENG_8_1:1.3.2.3.0.4
	RELENG_8_1_BP:1.3.2.3
	RELENG_7_3_0_RELEASE:1.1.2.3.6.1
	RELENG_7_3:1.1.2.3.0.6
	RELENG_7_3_BP:1.1.2.3
	RELENG_8_0_0_RELEASE:1.3.2.3.2.1
	RELENG_8_0:1.3.2.3.0.2
	RELENG_8_0_BP:1.3.2.3
	RELENG_8:1.3.0.2
	RELENG_8_BP:1.3
	RELENG_7_2_0_RELEASE:1.1.2.3.4.1
	RELENG_7_2:1.1.2.3.0.4
	RELENG_7_2_BP:1.1.2.3
	RELENG_7_1_0_RELEASE:1.1.2.3.2.1
	RELENG_6_4_0_RELEASE:1.1.4.1.2.1
	RELENG_7_1:1.1.2.3.0.2
	RELENG_7_1_BP:1.1.2.3
	RELENG_6_4:1.1.4.1.0.2
	RELENG_6_4_BP:1.1.4.1
	RELENG_6:1.1.0.4
	RELENG_7:1.1.0.2;
locks; strict;
comment	@# @;


1.6
date	2012.11.17.01.52.59;	author svnexp;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2009.10.03.12.22.12;	author nyan;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2009.09.27.13.24.34;	author nyan;	state Exp;
branches;
next	1.3;

1.3
date	2008.07.31.02.13.36;	author ps;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2008.06.26.10.21.54;	author dfr;	state Exp;
branches;
next	1.1;

1.1
date	2008.03.27.11.55.03;	author dfr;	state Exp;
branches
	1.1.2.1
	1.1.4.1;
next	;

1.6.2.1
date	2012.11.17.01.52.59;	author svnexp;	state dead;
branches;
next	1.6.2.2;

1.6.2.2
date	2013.03.28.13.05.22;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.5.2.1.2.1
	1.5.2.1.4.1;
next	1.5.2.2;

1.5.2.2
date	2012.11.17.11.37.18;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.5.2.1.2.2;

1.5.2.1.2.2
date	2012.11.17.08.37.14;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.5.2.1.4.2;

1.5.2.1.4.2
date	2012.11.17.08.48.05;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	2009.10.01.14.42.55;	author nyan;	state Exp;
branches;
next	1.3.2.3;

1.3.2.3
date	2009.10.07.14.14.05;	author nyan;	state Exp;
branches
	1.3.2.3.2.1
	1.3.2.3.4.1
	1.3.2.3.6.1
	1.3.2.3.8.1;
next	1.3.2.4;

1.3.2.4
date	2012.11.17.10.36.57;	author svnexp;	state Exp;
branches;
next	;

1.3.2.3.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.3.2.3.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.3.2.3.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.3.2.3.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.3.2.3.8.2;

1.3.2.3.8.2
date	2012.11.17.08.25.33;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2008.04.10.09.39.24;	author dfr;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2008.08.05.10.35.51;	author dfr;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2008.10.01.06.17.15;	author ru;	state Exp;
branches
	1.1.2.3.2.1
	1.1.2.3.4.1
	1.1.2.3.6.1
	1.1.2.3.8.1;
next	1.1.2.4;

1.1.2.4
date	2012.11.17.08.06.54;	author svnexp;	state Exp;
branches;
next	;

1.1.2.3.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.1.2.3.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.1.2.3.6.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.1.2.3.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.2.3.8.2;

1.1.2.3.8.2
date	2012.11.17.08.17.27;	author svnexp;	state Exp;
branches;
next	;

1.1.4.1
date	2008.04.24.10.46.20;	author dfr;	state Exp;
branches
	1.1.4.1.2.1;
next	1.1.4.2;

1.1.4.2
date	2012.11.17.07.44.23;	author svnexp;	state Exp;
branches;
next	;

1.1.4.1.2.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/nfslockd/Makefile 197730 2009-10-03 12:22:12Z nyan $

.PATH: ${.CURDIR}/../../nlm ${.CURDIR}/../../rpc
KMOD=	nfslockd
SRCS=	vnode_if.h \
	nlm_advlock.c \
	nlm_prot_clnt.c \
	nlm_prot_impl.c \
	nlm_prot_server.c \
	nlm_prot_svc.c \
	nlm_prot_xdr.c \
	sm_inter_xdr.c
SRCS+=	opt_inet6.h opt_nfs.h

.if !defined(KERNBUILDDIR)
NFS_INET6?=	1	# 0/1 - requires INET6 to be configured in kernel

.if ${NFS_INET6} > 0
opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}
.endif

.endif

.include <bsd.kmod.mk>
@


1.6.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:22 +0000
@
text
@d1 25
@


1.6.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 25
# $FreeBSD: releng/8.4/sys/modules/nfslockd/Makefile 197836 2009-10-07 14:14:05Z nyan $

.PATH: ${.CURDIR}/../../nlm ${.CURDIR}/../../rpc
KMOD=	nfslockd
SRCS=	vnode_if.h \
	nlm_advlock.c \
	nlm_prot_clnt.c \
	nlm_prot_impl.c \
	nlm_prot_server.c \
	nlm_prot_svc.c \
	nlm_prot_xdr.c \
	sm_inter_xdr.c
SRCS+=	opt_inet6.h opt_nfs.h

.if !defined(KERNBUILDDIR)
NFS_INET6?=	1	# 0/1 - requires INET6 to be configured in kernel

.if ${NFS_INET6} > 0
opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}
.endif

.endif

.include <bsd.kmod.mk>
@


1.5
log
@SVN rev 197730 on 2009-10-03 12:22:12Z by nyan

unifdef NFSCLIENT because the nlm depends on the nfsclient even if NFSCLIENT
is not defined.

Now the nfslockd module works with the nfsclient module.

Reviewed by:	kib
MFC after:	3 days
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.5.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.5.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/nfslockd/Makefile 197730 2009-10-03 12:22:12Z nyan $
@


1.5.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.5.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/nfslockd/Makefile 197730 2009-10-03 12:22:12Z nyan $
@


1.5.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.5.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/nfslockd/Makefile 197730 2009-10-03 12:22:12Z nyan $
@


1.4
log
@SVN rev 197535 on 2009-09-27 13:24:34Z by nyan

Add '#define NFSCLIENT' into opt_nfs.h if the NFSCLIENT variable is 1
(the default is 1).

This makes the nfslockd module works for NFS client.

Reviewed by:	dfr
MFC after:	3 days
@
text
@a16 1
NFSCLIENT?=	1	# 0/1 - requires NFSCLIENT to be configured in kernel
a22 5
.if ${NFSCLIENT} > 0
opt_nfs.h:
	echo "#define NFSCLIENT 1" > ${.TARGET}
.endif

@


1.3
log
@SVN rev 181040 on 2008-07-31 02:13:36Z by ps

Unbreak the build by creating opt_nfs.h
@
text
@d17 1
d23 6
@


1.3.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.3.2.2
log
@SVN rev 197669 on 2009-10-01 14:42:55Z by nyan

MFC: revision 197535

  Add '#define NFSCLIENT' into opt_nfs.h if the NFSCLIENT variable is 1
  (the default is 1).

  This makes the nfslockd module works for NFS client.

  Reviewed by:	dfr

Approved by:	re (kib)
@
text
@a16 1
NFSCLIENT?=	1	# 0/1 - requires NFSCLIENT to be configured in kernel
a21 6

.if ${NFSCLIENT} > 0
opt_nfs.h:
	echo "#define NFSCLIENT 1" > ${.TARGET}
.endif

@


1.3.2.3
log
@SVN rev 197836 on 2009-10-07 14:14:05Z by nyan

MFC: revision 197730

  unifdef NFSCLIENT because the nlm depends on the nfsclient even if NFSCLIENT
  is not defined.

  Now the nfslockd module works with the nfsclient module.

  Reviewed by:	kib

Approved by:	re (kensmith)
@
text
@d17 1
d24 5
@


1.3.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/nfslockd/Makefile 197836 2009-10-07 14:14:05Z nyan $
@


1.3.2.3.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.2.3.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/nfslockd/Makefile 197836 2009-10-07 14:14:05Z nyan $
@


1.3.2.3.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.3.2.3.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.3.2.3.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.2
log
@SVN rev 180025 on 2008-06-26 10:21:54Z by dfr

Re-implement the client side of rpc.lockd in the kernel. This implementation
provides the correct semantics for flock(2) style locks which are used by the
lockf(1) command line tool and the pidfile(3) library. It also implements
recovery from server restarts and ensures that dirty cache blocks are written
to the server before obtaining locks (allowing multiple clients to use file
locking to safely share data).

Sponsored by:	Isilon Systems
PR:		94256
MFC after:	2 weeks
@
text
@d13 1
a13 1
SRCS+=	opt_inet6.h
@


1.1
log
@Add nfslockd and krpc modules.
@
text
@d6 1
@


1.1.4.1
log
@MFC: kernel-mode NFS lock manager.
@
text
@@


1.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/modules/nfslockd/Makefile 178459 2008-04-24 10:46:25Z dfr $
@


1.1.4.1.2.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.1.2.1
log
@MFC: Kernel mode Network Lock Manager.
@
text
@@


1.1.2.2
log
@SVN rev 181328 on 2008-08-05 10:35:51Z by dfr

MFC: r180025,180064,180069,180217,180743,180779-180780

Implement support for NFS advisory locking in the kernel including correct
semantics for flock(2) style locks.

Sponsored by:	Isilon Systems
PR:		94256
@
text
@a5 1
	nlm_advlock.c \
@


1.1.2.3
log
@SVN rev 183511 on 2008-10-01 06:17:15Z by ru

MFC: fix the build when MODULES_WITH_WORLD is defined.

Approved by:	re (kib)
@
text
@d13 1
a13 1
SRCS+=	opt_inet6.h opt_nfs.h
@


1.1.2.4
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/nfslockd/Makefile 183511 2008-10-01 06:17:15Z ru $
@


1.1.2.3.8.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.1.2.3.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/nfslockd/Makefile 183511 2008-10-01 06:17:15Z ru $
@


1.1.2.3.6.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.1.2.3.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.1.2.3.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


