diff options
| author | dfr <dfr@FreeBSD.org> | 2008-04-24 10:46:25 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 2008-04-24 10:46:25 +0000 |
| commit | 0536363c8541b26238166e5c92aa1e95b5301de5 (patch) | |
| tree | 8c97e3c22fb5d10b178d42cd84e0e342195b5d38 /sys/i386 | |
| parent | 5f5afc39964fccc94d6d6e77d20a9e6d12e5dfc8 (diff) | |
| download | FreeBSD-src-0536363c8541b26238166e5c92aa1e95b5301de5.zip FreeBSD-src-0536363c8541b26238166e5c92aa1e95b5301de5.tar.gz | |
MFC: kernel-mode NFS lock manager.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/i386/conf/XBOX | 1 | ||||
| -rw-r--r-- | sys/i386/ibcs2/ibcs2_fcntl.c | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 7afb81a..daa0818 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -40,6 +40,7 @@ options UFS_DIRHASH # Improve performance on big directories options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem @@ -58,6 +59,13 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options ADAPTIVE_GIANT # Giant mutex is adaptive. +options KDB +options KDB_TRACE +options KDB_UNATTENDED +options DDB +options DDB_NUMSYM +options GDB + device apic # I/O APIC # Bus support. diff --git a/sys/i386/conf/XBOX b/sys/i386/conf/XBOX index faf13e7..f449ffdfe 100644 --- a/sys/i386/conf/XBOX +++ b/sys/i386/conf/XBOX @@ -30,6 +30,7 @@ options SOFTUPDATES # Enable FFS soft updates support #options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client #options NFSSERVER # Network Filesystem Server +#options NFSLOCKD # Network Lock Manager #options NFS_ROOT # NFS usable as /, requires NFSCLIENT #options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c index fcdc714..6875aef 100644 --- a/sys/i386/ibcs2/ibcs2_fcntl.c +++ b/sys/i386/ibcs2/ibcs2_fcntl.c @@ -93,7 +93,7 @@ cvt_flock2iflock(flp, iflp) iflp->l_whence = (short)flp->l_whence; iflp->l_start = (ibcs2_off_t)flp->l_start; iflp->l_len = (ibcs2_off_t)flp->l_len; - iflp->l_sysid = 0; + iflp->l_sysid = flp->l_sysid; iflp->l_pid = (ibcs2_pid_t)flp->l_pid; } @@ -127,6 +127,7 @@ cvt_iflock2flock(iflp, flp) break; } flp->l_whence = iflp->l_whence; + flp->l_sysid = iflp->l_sysid; } /* convert iBCS2 mode into NetBSD mode */ |
