From b3dcb627083036f5947477f29ff90ebdcf7e4ea4 Mon Sep 17 00:00:00 2001
From: chs <chs@NetBSD.org>
Date: Fri, 1 Dec 2000 07:02:40 +0000
Subject: [PATCH] fix merge error: ext2fs uses a custom balloc rather than a
 VOP-style one.

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

diff --git a/sys/ufs/ext2fs/ext2fs_readwrite.c b/sys/ufs/ext2fs/ext2fs_readwrite.c
index 12349860073f..20828a858be8 100644
--- a/sys/ufs/ext2fs/ext2fs_readwrite.c
+++ b/sys/ufs/ext2fs/ext2fs_readwrite.c
@@ -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 @@ ext2fs_write(v)
 			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) {