d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for iovcnt greater than 1. This should resolve problems

Browse Source 
with some applications.

Obtained from:	Darwin project
MFC after:	2 weeks
This commit is contained in:
Boris Popov 2002-02-21 16:23:38 +00:00
parent 6cd9842f4b
commit cebcee2e9e
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/kern/subr_mchain.c
View File

@ -266,7 +266,6 @@ mb_put_mbuf(struct mbchain *mbp, struct mbuf *m)
/*
* copies a uio scatter/gather list to an mbuf chain.
* NOTE: can ony handle iovcnt == 1
*/
int
mb_put_uio(struct mbchain *mbp, struct uio *uiop, int size)
@ -274,14 +273,17 @@ mb_put_uio(struct mbchain *mbp, struct uio *uiop, int size)
long left;
int mtype, error;
#ifdef DIAGNOSTIC
if (uiop->uio_iovcnt != 1)
MBPANIC("iovcnt != 1");
#endif
mtype = (uiop->uio_segflg == UIO_SYSSPACE) ? MB_MSYSTEM : MB_MUSER;
while (size > 0) {
while (size > 0 && uiop->uio_resid) {
if (uiop->uio_iovcnt <= 0 || uiop->uio_iov == NULL)
return EFBIG;
left = uiop->uio_iov->iov_len;
if (left == 0) {
uiop->uio_iov++;
uiop->uio_iovcnt--;
continue;
}
if (left > size)
left = size;
error = mb_put_mem(mbp, uiop->uio_iov->iov_base, left, mtype);
@ -522,10 +524,15 @@ md_get_uio(struct mdchain *mdp, struct uio *uiop, int size)
int mtype, error;
mtype = (uiop->uio_segflg == UIO_SYSSPACE) ? MB_MSYSTEM : MB_MUSER;
while (size > 0) {
while (size > 0 && uiop->uio_resid) {
if (uiop->uio_iovcnt <= 0 || uiop->uio_iov == NULL)
return EFBIG;
left = uiop->uio_iov->iov_len;
if (left == 0) {
uiop->uio_iov++;
uiop->uio_iovcnt--;
continue;
}
uiocp = uiop->uio_iov->iov_base;
if (left > size)
left = size;
@ -534,13 +541,8 @@ md_get_uio(struct mdchain *mdp, struct uio *uiop, int size)
return error;
uiop->uio_offset += left;
uiop->uio_resid -= left;
if (uiop->uio_iov->iov_len <= size) {
uiop->uio_iovcnt--;
uiop->uio_iov++;
} else {
uiop->uio_iov->iov_base += left;
uiop->uio_iov->iov_len -= left;
}
uiop->uio_iov->iov_base += left;
uiop->uio_iov->iov_len -= left;
size -= left;
}
return 0;