[src/trunk]: src/sys/ufs/ext2fs fix merge error: ext2fs uses a custom balloc ...

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

details:   https://anonhg.NetBSD.org/src/rev/10d7a713b2eb
branches:  trunk
changeset: 499876:10d7a713b2eb
user:      chs <chs%NetBSD.org@localhost>
date:      Fri Dec 01 07:02:40 2000 +0000

description:
fix merge error: ext2fs uses a custom balloc rather than a VOP-style one.

diffstat:

 sys/ufs/ext2fs/ext2fs_readwrite.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (21 lines):

diff -r fbded38f86b7 -r 10d7a713b2eb sys/ufs/ext2fs/ext2fs_readwrite.c
--- a/sys/ufs/ext2fs/ext2fs_readwrite.c Fri Dec 01 04:37:54 2000 +0000
+++ b/sys/ufs/ext2fs/ext2fs_readwrite.c Fri Dec 01 07:02:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ext2fs_readwrite.c,v 1.14 2000/11/27 08:39:53 chs Exp $        */
+/*     $NetBSD: ext2fs_readwrite.c,v 1.15 2000/12/01 07:02:40 chs Exp $        */
 
 /*-
  * Copyright (c) 1997 Manuel Bouyer.
@@ -314,9 +314,8 @@
                        flags |= B_CLRBUF;
                else
                        flags &= ~B_CLRBUF;
-               error = VOP_BALLOC(vp, lblktosize(fs, lbn),
-                                  blkoffset + xfersize, ap->a_cred, flags,
-                                  &bp);
+               error = ext2fs_balloc(ip,
+                   lbn, blkoffset + xfersize, ap->a_cred, &bp, flags);
                if (error)
                        break;
                if (ip->i_e2fs_size < uio->uio_offset + xfersize) {