diff options
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/nfs/swapnfs.c | 55 |
2 files changed, 1 insertions, 58 deletions
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index 0240b4a73ae..22f1d295f5d 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vfsops.c,v 1.58 2005/11/30 10:35:08 pedro Exp $ */ +/* $OpenBSD: nfs_vfsops.c,v 1.59 2005/12/27 18:31:12 miod Exp $ */ /* $NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $ */ /* @@ -357,14 +357,12 @@ nfs_mountroot() #ifdef DEBUG printf("swap size: 0x%lx (blocks)\n", n); #endif - swdevt[0].sw_nblks = n; return (0); } printf("WARNING: no swap\n"); swdevt[0].sw_dev = NODEV; swdevt[0].sw_vp = NULL; - swdevt[0].sw_nblks = 0; return (0); } diff --git a/sys/nfs/swapnfs.c b/sys/nfs/swapnfs.c deleted file mode 100644 index b97f310efde..00000000000 --- a/sys/nfs/swapnfs.c +++ /dev/null @@ -1,55 +0,0 @@ -/* $OpenBSD: swapnfs.c,v 1.5 2003/06/02 23:28:20 millert Exp $ */ -/* $NetBSD: swapnfs.c,v 1.9 1995/04/30 07:03:13 cgd Exp $ */ - -/* - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Rick Macklem at The University of Guelph. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)nfsswapvmunix.c 7.1 (Berkeley) 3/4/91 - */ - -/* - * NFS parameters are now filled in nfs_mountroot() by - * nfs_boot(). - */ - -#include <sys/param.h> -#include <sys/conf.h> -#include <sys/systm.h> - -dev_t rootdev = NODEV; -dev_t dumpdev = NODEV; - -struct swdevt swdevt[] = { - { NODEV, 0, 0 }, - { NODEV, 0, 0 } -}; - -int (*mountroot)(void) = nfs_mountroot; |