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

[Gleb Smirnoff]

Author: glebius
Date: Mon Mar 30 15:24:23 2015
New Revision: 280854
URL: https://svnweb.freebsd.org/changeset/base/280854

Log:
  nios should be volatile.

Modified:
  projects/sendfile/sys/kern/uipc_syscalls.c

Modified: projects/sendfile/sys/kern/uipc_syscalls.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_syscalls.c	Mon Mar 30 14:28:31 2015	(r280853)
+++ projects/sendfile/sys/kern/uipc_syscalls.c	Mon Mar 30 15:24:23 2015	(r280854)
@@ -2069,7 +2069,7 @@ fixspace(int old, int new, off_t off, in
  * call pru_ready on the socket, to notify it of readyness of the data.
  */
 struct sf_io {
-	u_int		nios;
+	volatile u_int	nios;
 	u_int		error;
 	int		npages;
 	struct file	*sock_fp;
@@ -2576,8 +2576,7 @@ retry_space:
 			 * send (rem > space), or if we have readahead
 			 * configured (rhpages > 0).
 			 */
-			if ((flags & SF_NOCACHE) == 0 ||
-			    (i == npages - 1 &&
+			if ((i == npages - 1 &&
 			    ((off + space) & PAGE_MASK) &&
 			    (rem > space || rhpages > 0)))
 				m0->m_ext.ext_type = EXT_SFBUF;