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

Consistently set status to -1 when completing an AIO request with an error.

Browse Source 
Sponsored by:	Chelsio Communications
This commit is contained in:
John Baldwin 2016-05-20 19:46:25 +00:00
parent a00ef24037
commit f0ec174043
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=300331
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/sys_socket.c
View File

@ -605,7 +605,6 @@ soaio_process_job(struct socket *so, struct sockbuf *sb, struct kaiocb *job)
cnt -= uio.uio_resid;
td->td_ucred = td_savedcred;
/* XXX: Not sure if this is needed? */
if (cnt != 0 && (error == ERESTART || error == EINTR ||
error == EWOULDBLOCK))
error = 0;
@ -633,7 +632,10 @@ soaio_process_job(struct socket *so, struct sockbuf *sb, struct kaiocb *job)
TAILQ_INSERT_HEAD(&sb->sb_aiojobq, job, list);
}
} else {
aio_complete(job, cnt, error);
if (error)
aio_complete(job, -1, error);
else
aio_complete(job, cnt, 0);
SOCKBUF_LOCK(sb);
}
}

20
sys/kern/vfs_aio.c
View File

@ -806,7 +806,10 @@ aio_process_rw(struct kaiocb *job)
cnt -= auio.uio_resid;
td->td_ucred = td_savedcred;
aio_complete(job, cnt, error);
if (error)
aio_complete(job, -1, error);
else
aio_complete(job, cnt, 0);
}
static void
@ -824,7 +827,10 @@ aio_process_sync(struct kaiocb *job)
if (fp->f_vnode != NULL)
error = aio_fsync_vnode(td, fp->f_vnode);
td->td_ucred = td_savedcred;
aio_complete(job, 0, error);
if (error)
aio_complete(job, -1, error);
else
aio_complete(job, 0, 0);
}
static void
@ -839,7 +845,10 @@ aio_process_mlock(struct kaiocb *job)
aio_switch_vmspace(job);
error = vm_mlock(job->userproc, job->cred,
__DEVOLATILE(void *, cb->aio_buf), cb->aio_nbytes);
aio_complete(job, 0, error);
if (error)
aio_complete(job, -1, error);
else
aio_complete(job, 0, 0);
}
static void
@ -2323,7 +2332,10 @@ aio_physwakeup(struct bio *bp)
else
job->inputcharge += nblks;
aio_complete(job, nbytes, error);
if (error)
aio_complete(job, -1, error);
else
aio_complete(job, nbytes, 0);
g_destroy_bio(bp);
}