[src/netbsd-1-6]: src/sys/ufs/ffs Pull up revision 1.30 (requested by chuq in...

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

details:   https://anonhg.NetBSD.org/src/rev/e1fb291a09cc
branches:  netbsd-1-6
changeset: 527759:e1fb291a09cc
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Jun 05 09:32:06 2002 +0000

description:
Pull up revision 1.30 (requested by chuq in ticket #171):
get the units right when computing a blkno in the ENOSPC path
for allocations involving indirect blocks.
spotted by Trevin Beattie <trevin%xmission.com@localhost>.

diffstat:

 sys/ufs/ffs/ffs_balloc.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r eaa87f1b6e68 -r e1fb291a09cc sys/ufs/ffs/ffs_balloc.c
--- a/sys/ufs/ffs/ffs_balloc.c  Wed Jun 05 05:56:08 2002 +0000
+++ b/sys/ufs/ffs/ffs_balloc.c  Wed Jun 05 09:32:06 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_balloc.c,v 1.29 2001/11/08 05:27:25 chs Exp $      */
+/*     $NetBSD: ffs_balloc.c,v 1.29.10.1 2002/06/05 09:32:06 lukem Exp $       */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.29 2001/11/08 05:27:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.29.10.1 2002/06/05 09:32:06 lukem Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -439,7 +439,7 @@
                            0);
                        if (bp->b_flags & B_DELWRI) {
                                nb = fsbtodb(fs, cgtod(fs, dtog(fs,
-                                   bp->b_blkno)));
+                                   dbtofsb(fs, bp->b_blkno))));
                                bwrite(bp);
                                bp = getblk(ip->i_devvp, nb, (int)fs->fs_cgsize,
                                    0, 0);