[src/netbsd-1-4]: src/sys/adosfs pullup 1.48->1.49 (is): ADOSFS with fsize>512

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3a45aa0b7963
branches:  netbsd-1-4
changeset: 468884:3a45aa0b7963
user:      perry <perry%NetBSD.org@localhost>
date:      Tue Jun 22 14:32:52 1999 +0000

description:
pullup 1.48->1.49 (is): ADOSFS with fsize>512

diffstat:

 sys/adosfs/advnops.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (67 lines):

diff -r 47abb23c026f -r 3a45aa0b7963 sys/adosfs/advnops.c
--- a/sys/adosfs/advnops.c      Tue Jun 22 14:32:00 1999 +0000
+++ b/sys/adosfs/advnops.c      Tue Jun 22 14:32:52 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: advnops.c,v 1.48 1999/03/22 19:21:07 kleink Exp $      */
+/*     $NetBSD: advnops.c,v 1.48.2.1 1999/06/22 14:32:52 perry Exp $   */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -288,7 +288,7 @@
                 * but not much as ados makes little attempt to 
                 * make things contigous
                 */
-               error = bread(sp->a_vp, lbn * amp->secsperblk,
+               error = bread(sp->a_vp, lbn * amp->bsize / DEV_BSIZE,
                              amp->bsize, NOCRED, &bp);
                if (error) {
                        brelse(bp);
@@ -302,14 +302,14 @@
                        else if (adoswordn(bp, 0) != BPT_DATA) {
 #ifdef DIAGNOSTIC
                                printf("adosfs: bad primary type blk %ld\n",
-                                   bp->b_blkno / amp->secsperblk);
+                                   bp->b_blkno / (amp->bsize / DEV_BSIZE));
 #endif
                                error=EINVAL;
                        }
                        else if ( adoscksum(bp, ap->nwords)) {
 #ifdef DIAGNOSTIC
                                printf("adosfs: blk %ld failed cksum.\n",
-                                   bp->b_blkno / amp->secsperblk);
+                                   bp->b_blkno / (amp->bsize / DEV_BSIZE));
 #endif
                                error=EINVAL;
                        }
@@ -496,7 +496,7 @@
        advopprint(sp);
 #endif
        ap = VTOA(sp->a_vp);
-       bn = sp->a_bn / ap->amp->secsperblk;
+       bn = sp->a_bn / (ap->amp->bsize / DEV_BSIZE);
        bnp = sp->a_bnp;
        error = 0;
 
@@ -549,7 +549,7 @@
                        error = EINVAL;
                        goto reterr;
                }
-               error = bread(ap->amp->devvp, nb * ap->amp->secsperblk,
+               error = bread(ap->amp->devvp, nb * ap->amp->bsize / DEV_BSIZE,
                              ap->amp->bsize, NOCRED, &flbp);
                if (error) {
                        brelse(flbp);
@@ -580,11 +580,11 @@
        flblkoff = bn % ANODENDATBLKENT(ap);
        if (flblkoff < adoswordn(flbp, 2 /* ADBI_NBLKTABENT */)) {
                flblkoff = (ap->nwords - 51) - flblkoff;
-               *bnp = adoswordn(flbp, flblkoff) * ap->amp->secsperblk;
+               *bnp = adoswordn(flbp, flblkoff) * ap->amp->bsize / DEV_BSIZE;
        } else {
 #ifdef DIAGNOSTIC
                printf("flblk offset %ld too large in lblk %ld blk %d\n", 
-                   flblkoff, bn / ap->amp->secsperblk , flbp->b_blkno);
+                   flblkoff, bn / (ap->amp->bsize / DEV_BSIZE), flbp->b_blkno);
 #endif
                error = EINVAL;
        }