Date: Sun, 1 Dec 2013 20:32:17 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258813 - projects/sendfile/sys/kern Message-ID: <201312012032.rB1KWHTR096175@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Sun Dec 1 20:32:16 2013 New Revision: 258813 URL: http://svnweb.freebsd.org/changeset/base/258813 Log: More correct code that handles sf wait logic. Submitted by: kib Modified: projects/sendfile/sys/kern/uipc_syscalls.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Sun Dec 1 20:03:00 2013 (r258812) +++ projects/sendfile/sys/kern/uipc_syscalls.c Sun Dec 1 20:32:16 2013 (r258813) @@ -2564,9 +2564,7 @@ retry_space: * threads might exhaust the buffers and then * deadlock. */ - if (m != NULL) - sfwait = SFB_NOWAIT; - sf = sf_buf_alloc(pg, sfwait); + sf = sf_buf_alloc(pg, m != NULL : SFB_NOWAIT ? sfwait); if (sf == NULL) { SFSTAT_INC(sf_allocfail); vm_page_lock(pg);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312012032.rB1KWHTR096175>