From owner-svn-src-head@freebsd.org Fri May 20 19:46:27 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 006EDB44D8E; Fri, 20 May 2016 19:46:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A869E1761; Fri, 20 May 2016 19:46:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4KJkPbA027887; Fri, 20 May 2016 19:46:25 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4KJkPKw027885; Fri, 20 May 2016 19:46:25 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201605201946.u4KJkPKw027885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 20 May 2016 19:46:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300331 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 May 2016 19:46:27 -0000 Author: jhb Date: Fri May 20 19:46:25 2016 New Revision: 300331 URL: https://svnweb.freebsd.org/changeset/base/300331 Log: Consistently set status to -1 when completing an AIO request with an error. Sponsored by: Chelsio Communications Modified: head/sys/kern/sys_socket.c head/sys/kern/vfs_aio.c Modified: head/sys/kern/sys_socket.c ============================================================================== --- head/sys/kern/sys_socket.c Fri May 20 19:38:01 2016 (r300330) +++ head/sys/kern/sys_socket.c Fri May 20 19:46:25 2016 (r300331) @@ -605,7 +605,6 @@ retry: 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 @@ retry: 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); } } Modified: head/sys/kern/vfs_aio.c ============================================================================== --- head/sys/kern/vfs_aio.c Fri May 20 19:38:01 2016 (r300330) +++ head/sys/kern/vfs_aio.c Fri May 20 19:46:25 2016 (r300331) @@ -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); }