new copyright notice

[unix-history] / usr / src / sys / ufs / ffs / ufs_disksubr.c

diff --git a/usr/src/sys/ufs/ffs/ufs_disksubr.c b/usr/src/sys/ufs/ffs/ufs_disksubr.c
index 7486d8a..fb22543 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_disksubr.c
+++ b/usr/src/sys/ufs/ffs/ufs_disksubr.c
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.

  *
  *

- *     @(#)ufs_disksubr.c      7.10 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ *     @(#)ufs_disksubr.c      7.14 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -11,8 +12,6 @@
 #include "buf.h"
 #include "disklabel.h"
 #include "syslog.h"
 #include "buf.h"
 #include "disklabel.h"
 #include "syslog.h"

-
-#include "dir.h"

 #include "user.h"
 
 /*
 #include "user.h"
 
 /*


@@ -149,9 +148,7 @@ readdisklabel(dev, strat, lp)
        bp->b_flags = B_BUSY | B_READ;
        bp->b_cylin = LABELSECTOR / lp->d_secpercyl;
        (*strat)(bp);
        bp->b_flags = B_BUSY | B_READ;
        bp->b_cylin = LABELSECTOR / lp->d_secpercyl;
        (*strat)(bp);

-       biowait(bp);
-       if (bp->b_flags & B_ERROR) {
-               u.u_error = 0;          /* XXX */
+       if (biowait(bp)) {

                msg = "I/O error";
        } else for (dlp = (struct disklabel *)bp->b_un.b_addr;
            dlp <= (struct disklabel *)(bp->b_un.b_addr+DEV_BSIZE-sizeof(*dlp));
                msg = "I/O error";
        } else for (dlp = (struct disklabel *)bp->b_un.b_addr;
            dlp <= (struct disklabel *)(bp->b_un.b_addr+DEV_BSIZE-sizeof(*dlp));


@@ -159,7 +156,8 @@ readdisklabel(dev, strat, lp)
                if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
                        if (msg == NULL)
                                msg = "no disk label";
                if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
                        if (msg == NULL)
                                msg = "no disk label";

-               } else if (dkcksum(dlp) != 0)
+               } else if (dlp->d_npartitions > MAXPARTITIONS ||
+                          dkcksum(dlp) != 0)

                        msg = "disk label corrupted";
                else {
                        *lp = *dlp;
                        msg = "disk label corrupted";
                else {
                        *lp = *dlp;


@@ -167,8 +165,6 @@ readdisklabel(dev, strat, lp)
                        break;
                }
        }
                        break;
                }
        }

-       if (lp->d_npartitions > MAXPARTITIONS)
-               lp->d_npartitions = MAXPARTITIONS;

        bp->b_flags = B_INVAL | B_AGE;
        brelse(bp);
        return (msg);
        bp->b_flags = B_INVAL | B_AGE;
        brelse(bp);
        return (msg);


@@ -244,12 +240,8 @@ writedisklabel(dev, strat, lp)
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_READ;
        (*strat)(bp);
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_READ;
        (*strat)(bp);

-       biowait(bp);
-       if (bp->b_flags & B_ERROR) {
-               error = u.u_error;              /* XXX */
-               u.u_error = 0;
+       if (error = biowait(bp))

                goto done;
                goto done;

-       }

        for (dlp = (struct disklabel *)bp->b_un.b_addr;
            dlp <= (struct disklabel *)
              (bp->b_un.b_addr + lp->d_secsize - sizeof(*dlp));
        for (dlp = (struct disklabel *)bp->b_un.b_addr;
            dlp <= (struct disklabel *)
              (bp->b_un.b_addr + lp->d_secsize - sizeof(*dlp));


@@ -259,11 +251,7 @@ writedisklabel(dev, strat, lp)
                        *dlp = *lp;
                        bp->b_flags = B_WRITE;
                        (*strat)(bp);
                        *dlp = *lp;
                        bp->b_flags = B_WRITE;
                        (*strat)(bp);

-                       biowait(bp);
-                       if (bp->b_flags & B_ERROR) {
-                               error = u.u_error;              /* XXX */
-                               u.u_error = 0;
-                       }
+                       error = biowait(bp);

                        goto done;
                }
        }
                        goto done;
                }
        }


@@ -340,6 +328,6 @@ diskerr(bp, dname, what, pri, blkdone, lp)
                (*pr)(" (%s%d bn %d; cn %d", dname, unit, sn,
                    sn / lp->d_secpercyl);
                sn %= lp->d_secpercyl;
                (*pr)(" (%s%d bn %d; cn %d", dname, unit, sn,
                    sn / lp->d_secpercyl);
                sn %= lp->d_secpercyl;

-               (*pr)(" tn %d sn %d)", sn / lp->d_ntracks, sn % lp->d_ntracks);
+               (*pr)(" tn %d sn %d)", sn / lp->d_nsectors, sn % lp->d_nsectors);

        }
 }
        }
 }