missing fsbtodb (from noemi@osf.org)

SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 7.16
SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 7.16

diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c
index 8b6c6e8..1d307fb 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_alloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_alloc.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)ffs_alloc.c 7.15 (Berkeley) %G%
+ *     @(#)ffs_alloc.c 7.16 (Berkeley) %G%

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


@@ -160,7 +160,7 @@ realloccg(ip, lbprev, bpref, osize, nsize, bpp)
         */
        cg = dtog(fs, bprev);
        if (bno = fragextend(ip, cg, (long)bprev, osize, nsize)) {
         */
        cg = dtog(fs, bprev);
        if (bno = fragextend(ip, cg, (long)bprev, osize, nsize)) {

-               if (bp->b_blkno != bno)
+               if (bp->b_blkno != fsbtodb(fs, bno))

                        panic("bad blockno");
                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;
                        panic("bad blockno");
                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index 4e523bd..9432a8e 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)lfs_alloc.c 7.15 (Berkeley) %G%
+ *     @(#)lfs_alloc.c 7.16 (Berkeley) %G%

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


@@ -160,7 +160,7 @@ realloccg(ip, lbprev, bpref, osize, nsize, bpp)
         */
        cg = dtog(fs, bprev);
        if (bno = fragextend(ip, cg, (long)bprev, osize, nsize)) {
         */
        cg = dtog(fs, bprev);
        if (bno = fragextend(ip, cg, (long)bprev, osize, nsize)) {

-               if (bp->b_blkno != bno)
+               if (bp->b_blkno != fsbtodb(fs, bno))

                        panic("bad blockno");
                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;
                        panic("bad blockno");
                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;