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

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

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

description:
pullup 1.35->1.36 (is): ADOSFS with fsize>512

diffstat:

 sys/adosfs/advfsops.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 8b5583160be7 -r 47abb23c026f sys/adosfs/advfsops.c
--- a/sys/adosfs/advfsops.c     Tue Jun 22 14:31:11 1999 +0000
+++ b/sys/adosfs/advfsops.c     Tue Jun 22 14:32:00 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: advfsops.c,v 1.35 1999/02/26 23:44:43 wrstuden Exp $   */
+/*     $NetBSD: advfsops.c,v 1.35.2.1 1999/06/22 14:32:00 perry Exp $  */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -395,7 +395,7 @@
        ap->nwords = amp->nwords;
        adosfs_ainshash(amp, ap);
 
-       if ((error = bread(amp->devvp, an * amp->secsperblk,
+       if ((error = bread(amp->devvp, an * amp->bsize / DEV_BSIZE,
                           amp->bsize, NOCRED, &bp)) != 0) {
                brelse(bp);
                vput(vp);
@@ -514,7 +514,7 @@
                ap->lastindblk = ap->linkto;
                brelse(bp);
                bp = NULL;
-               error = bread(amp->devvp, ap->linkto * amp->secsperblk,
+               error = bread(amp->devvp, ap->linkto * amp->bsize / DEV_BSIZE,
                    amp->bsize, NOCRED, &bp);
                if (error) {
                        brelse(bp);
@@ -595,7 +595,7 @@
 
        bp = mapbp = NULL;
        bn = amp->rootb;
-       if ((error = bread(amp->devvp, bn * amp->secsperblk, amp->bsize,
+       if ((error = bread(amp->devvp, bn * amp->bsize / DEV_BSIZE, amp->bsize,
            NOCRED, &bp)) != 0) {
                brelse(bp);
                return (error);
@@ -613,7 +613,7 @@
                if (mapbp != NULL)
                        brelse(mapbp);
                if ((error = bread(amp->devvp,
-                   adoswordn(bp, blkix) * amp->secsperblk, amp->bsize,
+                   adoswordn(bp, blkix) * amp->bsize / DEV_BSIZE, amp->bsize,
                     NOCRED, &mapbp)) != 0)
                        break;
                if (adoscksum(mapbp, amp->nwords)) {
@@ -640,7 +640,7 @@
                if (mapix < bmsize && blkix == endix) {
                        bn = adoswordn(bp, blkix);
                        brelse(bp);
-                       if ((error = bread(amp->devvp, bn * amp->secsperblk,
+                       if ((error = bread(amp->devvp, bn * amp->bsize / DEV_BSIZE,
                            amp->bsize, NOCRED, &bp)) != 0)
                                break;
                        /*