diff options
| author | Renato Botelho <renato@netgate.com> | 2017-03-13 10:27:25 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-03-13 10:27:25 -0300 |
| commit | f391165890a47339ab36ad68ac2e8a7ac318a2f4 (patch) | |
| tree | bb32a2782e69e28e5b16c4baa2891da7f2193c37 /sys/kern/vfs_aio.c | |
| parent | 01a697b38d55406857d04f6b92d9aaf15e492384 (diff) | |
| parent | f5b4bf3db9bb31ce466c39af8ee4b81aa991c7a6 (diff) | |
| download | FreeBSD-src-f391165890a47339ab36ad68ac2e8a7ac318a2f4.zip FreeBSD-src-f391165890a47339ab36ad68ac2e8a7ac318a2f4.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/kern/vfs_aio.c')
| -rw-r--r-- | sys/kern/vfs_aio.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index dce0e1a..1e01ccd 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> +#include <sys/syscallsubr.h> #include <sys/protosw.h> #include <sys/rwlock.h> #include <sys/sema.h> @@ -858,12 +859,9 @@ aio_process_mlock(struct kaiocb *job) ("%s: opcode %d", __func__, job->uaiocb.aio_lio_opcode)); aio_switch_vmspace(job); - error = vm_mlock(job->userproc, job->cred, - __DEVOLATILE(void *, cb->aio_buf), cb->aio_nbytes); - if (error) - aio_complete(job, -1, error); - else - aio_complete(job, 0, 0); + error = kern_mlock(job->userproc, job->cred, + __DEVOLATILE(uintptr_t, cb->aio_buf), cb->aio_nbytes); + aio_complete(job, error != 0 ? -1 : 0, error); } static void |
