get rid of extraneous header files

[unix-history] / usr / src / sys / vm / vm_swap.c

diff --git a/usr/src/sys/vm/vm_swap.c b/usr/src/sys/vm/vm_swap.c
index a0c70ee..4543dae 100644 (file)
--- a/usr/src/sys/vm/vm_swap.c
+++ b/usr/src/sys/vm/vm_swap.c
@@ -1,51 +1,72 @@
-/*     vm_swap.c       4.2     %G%     */
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)vm_swap.c   7.4 (Berkeley) %G%
+ */

 
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/map.h"
+#include "param.h"
+#include "systm.h"
+#include "buf.h"
+#include "conf.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "map.h"
+#include "uio.h"
+#include "file.h"
+#include "stat.h"
+#include "stat.h"

 
 

-struct buf rswbuf;

 /*
  * Indirect driver for multi-controller paging.
  */
 swstrategy(bp)
        register struct buf *bp;
 {
 /*
  * Indirect driver for multi-controller paging.
  */
 swstrategy(bp)
        register struct buf *bp;
 {

-       int sz, off, seg;
-       dev_t dev;
+       int sz, off, seg, index;
+       register struct swdevt *sp;

 
 

-       sz = (bp->b_bcount+511)/512;
-       off = bp->b_blkno % DMMAX;
-       if (bp->b_blkno+sz > nswap || off+sz > DMMAX) {
+#ifdef GENERIC
+       /*
+        * A mini-root gets copied into the front of the swap
+        * and we run over top of the swap area just long
+        * enough for us to do a mkfs and restor of the real
+        * root (sure beats rewriting standalone restor).
+        */
+#define        MINIROOTSIZE    4096
+       if (rootdev == dumpdev)
+               bp->b_blkno += MINIROOTSIZE;
+#endif
+       sz = howmany(bp->b_bcount, DEV_BSIZE);
+       if (bp->b_blkno+sz > nswap) {

                bp->b_flags |= B_ERROR;
                bp->b_flags |= B_ERROR;

-               iodone(bp);
+               biodone(bp);

                return;
        }
                return;
        }

-       seg = bp->b_blkno / DMMAX;
-       dev = swdevt[seg % nswdev].sw_dev;
-       seg /= nswdev;
-       bp->b_blkno = seg*DMMAX + off;
-       bp->b_dev = dev;
-       if (dev == 0)
+       if (nswdev > 1) {
+               off = bp->b_blkno % dmmax;
+               if (off+sz > dmmax) {
+                       bp->b_flags |= B_ERROR;
+                       biodone(bp);
+                       return;
+               }
+               seg = bp->b_blkno / dmmax;
+               index = seg % nswdev;
+               seg /= nswdev;
+               bp->b_blkno = seg*dmmax + off;
+       } else
+               index = 0;
+       sp = &swdevt[index];
+#ifdef SECSIZE
+       bp->b_blkno <<= sp->sw_bshift;
+       bp->b_blksize = sp->sw_blksize;
+#endif SECSIZE
+       bp->b_dev = sp->sw_dev;
+       if (bp->b_dev == 0)

                panic("swstrategy");
                panic("swstrategy");

-       (*bdevsw[major(dev)].d_strategy)(bp);
-}
-
-swread(dev)
-{
-
-       physio(swstrategy, &rswbuf, dev, B_READ, minphys);
-}
-
-swwrite(dev)
-{
-
-       physio(swstrategy, &rswbuf, dev, B_WRITE, minphys);
+       (*bdevsw[major(bp->b_dev)].d_strategy)(bp);

 }
 
 /*
 }
 
 /*


@@ -53,13 +74,22 @@ swwrite(dev)
  * which must be in the swdevsw.  Return EBUSY
  * if already swapping on this device.
  */
  * which must be in the swdevsw.  Return EBUSY
  * if already swapping on this device.
  */

-vswapon()
+swapon()

 {
 {

+       struct a {
+               char    *name;
+       } *uap = (struct a *)u.u_ap;

        register struct inode *ip;
        dev_t dev;
        register struct swdevt *sp;
        register struct inode *ip;
        dev_t dev;
        register struct swdevt *sp;

+       register struct nameidata *ndp = &u.u_nd;

 
 

-       ip = namei(uchar, 0);
+       if (u.u_error = suser(u.u_cred, &u.u_acflag))
+               return;
+       ndp->ni_nameiop = LOOKUP | FOLLOW;
+       ndp->ni_segflg = UIO_USERSPACE;
+       ndp->ni_dirp = uap->name;
+       ip = namei(ndp);

        if (ip == NULL)
                return;
        if ((ip->i_mode&IFMT) != IFBLK) {
        if (ip == NULL)
                return;
        if ((ip->i_mode&IFMT) != IFBLK) {


@@ -67,54 +97,98 @@ vswapon()
                iput(ip);
                return;
        }
                iput(ip);
                return;
        }

-       dev = (dev_t)ip->i_un.i_rdev;
+       dev = (dev_t)ip->i_rdev;

        iput(ip);
        if (major(dev) >= nblkdev) {
                u.u_error = ENXIO;
                return;
        }
        iput(ip);
        if (major(dev) >= nblkdev) {
                u.u_error = ENXIO;
                return;
        }

-       /*
-        * Search starting at second table entry,
-        * since first (primary swap area) is freed at boot.
-        */
-       for (sp = &swdevt[1]; sp->sw_dev; sp++)
+       for (sp = &swdevt[0]; sp->sw_dev; sp++)

                if (sp->sw_dev == dev) {
                        if (sp->sw_freed) {
                                u.u_error = EBUSY;
                                return;
                        }
                if (sp->sw_dev == dev) {
                        if (sp->sw_freed) {
                                u.u_error = EBUSY;
                                return;
                        }

-                       swfree(sp - swdevt);
+                       u.u_error = swfree(sp - swdevt);

                        return;
                }
                        return;
                }

-       u.u_error = ENODEV;
+       u.u_error = EINVAL;

 }
 
 }
 

+#ifdef SECSIZE
+long   argdbsize;              /* XXX */
+
+#endif SECSIZE

 /*
  * Swfree(index) frees the index'th portion of the swap map.
  * Each of the nswdev devices provides 1/nswdev'th of the swap
 /*
  * Swfree(index) frees the index'th portion of the swap map.
  * Each of the nswdev devices provides 1/nswdev'th of the swap

- * space, which is laid out with blocks of DMMAX pages circularly
+ * space, which is laid out with blocks of dmmax pages circularly

  * among the devices.
  */
 swfree(index)
        int index;
 {
  * among the devices.
  */
 swfree(index)
        int index;
 {

+       register struct swdevt *sp;
+       register struct swdevt *sp;

        register swblk_t vsbase;
        register swblk_t vsbase;

-       register int blk;
+       register long blk;
+       dev_t dev;
+       register swblk_t dvbase;
+       register int nblks;
+       int error;
+       int error;

 
 

-       swdevt[index].sw_freed = 1;
-       for (vsbase = index*DMMAX; vsbase < nswap; vsbase += nswdev*DMMAX) {
-               blk = nswap - vsbase;
-               if (blk > DMMAX)
-                       blk = DMMAX;
+       sp = &swdevt[index];
+       dev = sp->sw_dev;
+       if (error = (*bdevsw[major(dev)].d_open)(dev, FREAD|FWRITE, S_IFBLK))
+               return (error);
+       sp->sw_freed = 1;
+       nblks = sp->sw_nblks;
+       for (dvbase = 0; dvbase < nblks; dvbase += dmmax) {
+               blk = nblks - dvbase;
+               if ((vsbase = index*dmmax + dvbase*nswdev) >= nswap)
+                       panic("swfree");
+               if (blk > dmmax)
+                       blk = dmmax;

                if (vsbase == 0) {
                        /*
                         * Can't free a block starting at 0 in the swapmap
                if (vsbase == 0) {
                        /*
                         * Can't free a block starting at 0 in the swapmap

-                        * but need some space for argmap so use this
+                        * but need some space for argmap so use 1/2 this

                         * hunk which needs special treatment anyways.
                         */
                         * hunk which needs special treatment anyways.
                         */

-                       argdev = swdevt[0].sw_dev;
-                       mfree(argmap, blk-CLSIZE, vsbase+CLSIZE);
+                       argdev = sp->sw_dev;
+#ifdef SECSIZE
+                       argdbsize = sp->sw_blksize;
+                       rminit(argmap,
+                          ((blk / 2) * DEV_BSIZE - CLBYTES) / argdbsize,
+                          CLBYTES / argdbsize, "argmap", ARGMAPSIZE);
+#else SECSIZE
+                       rminit(argmap, (long)(blk/2-ctod(CLSIZE)),
+                           (long)ctod(CLSIZE), "argmap", ARGMAPSIZE);
+#endif SECSIZE
+                       /*
+                        * First of all chunks... initialize the swapmap
+                        * the second half of the hunk.
+                        */
+                       rminit(swapmap, (long)blk/2, (long)blk/2,
+                           "swap", nswapmap);
+               } else if (dvbase == 0) {
+                       /*
+                        * Don't use the first cluster of the device
+                        * in case it starts with a label or boot block.
+                        */
+                       rmfree(swapmap, blk - ctod(CLSIZE),
+                           vsbase + ctod(CLSIZE));
+               } else if (dvbase == 0) {
+                       /*
+                        * Don't use the first cluster of the device
+                        * in case it starts with a label or boot block.
+                        */
+                       rmfree(swapmap, blk - ctod(CLSIZE),
+                           vsbase + ctod(CLSIZE));

                } else
                } else

-                       mfree(swapmap, blk, vsbase);
+                       rmfree(swapmap, blk, vsbase);

        }
        }

+       return (0);
+       return (0);

 }
 }