svn commit: r258813 - projects/sendfile/sys/kern

[Gleb Smirnoff]

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);