fix merge error: ext2fs uses a custom balloc rather than a VOP-style one.
This commit is contained in:
parent
a51ea43fd6
commit
b3dcb62708
|
@ -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.
|
* Copyright (c) 1997 Manuel Bouyer.
|
||||||
|
@ -314,9 +314,8 @@ ext2fs_write(v)
|
||||||
flags |= B_CLRBUF;
|
flags |= B_CLRBUF;
|
||||||
else
|
else
|
||||||
flags &= ~B_CLRBUF;
|
flags &= ~B_CLRBUF;
|
||||||
error = VOP_BALLOC(vp, lblktosize(fs, lbn),
|
error = ext2fs_balloc(ip,
|
||||||
blkoffset + xfersize, ap->a_cred, flags,
|
lbn, blkoffset + xfersize, ap->a_cred, &bp, flags);
|
||||||
&bp);
|
|
||||||
if (error)
|
if (error)
|
||||||
break;
|
break;
|
||||||
if (ip->i_e2fs_size < uio->uio_offset + xfersize) {
|
if (ip->i_e2fs_size < uio->uio_offset + xfersize) {
|
||||||
|
|
Loading…
Reference in New Issue