Date: Wed, 16 Sep 2015 16:11:46 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r287863 - projects/sendfile/sys/kern Message-ID: <201509161611.t8GGBkxB072869@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Wed Sep 16 16:11:45 2015 New Revision: 287863 URL: https://svnweb.freebsd.org/changeset/base/287863 Log: When I/O fails run full protocol abort routine, instead of flushing socket only. The previous behavior lead to inconsistency between TCP state and socket state. Together with: rrs Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_syscalls.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Wed Sep 16 15:40:08 2015 (r287862) +++ projects/sendfile/sys/kern/uipc_syscalls.c Wed Sep 16 16:11:45 2015 (r287863) @@ -2114,8 +2114,8 @@ sf_iodone(void *arg, vm_page_t *pg, int * for read, so that application receives EIO on next * syscall and eventually closes the socket. */ + so->so_proto->pr_usrreqs->pru_abort(so); so->so_error = EIO; - soisdisconnected(so); m = sfio->m; for (int i = 0; i < sfio->npages; i++)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509161611.t8GGBkxB072869>