svn commit: r333860 - head/sys/kern

[Matt Macy]

Author: mmacy
Date: Sat May 19 05:10:51 2018
New Revision: 333860
URL: https://svnweb.freebsd.org/changeset/base/333860

Log:
  sendfile: annotate unused value and ensure that npages is actually initialized

Modified:
  head/sys/kern/kern_sendfile.c

Modified: head/sys/kern/kern_sendfile.c
==============================================================================
--- head/sys/kern/kern_sendfile.c	Sat May 19 05:09:10 2018	(r333859)
+++ head/sys/kern/kern_sendfile.c	Sat May 19 05:10:51 2018	(r333860)
@@ -341,7 +341,7 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, o
 	}
 
 	for (int i = 0; i < npages;) {
-		int j, a, count, rv;
+		int j, a, count, rv __unused;
 
 		/* Skip valid pages. */
 		if (vm_page_is_valid(pa[i], vmoff(i, off) & PAGE_MASK,
@@ -688,6 +688,7 @@ retry_space:
 			if (space == 0) {
 				sfio = NULL;
 				nios = 0;
+				npages = 0;
 				goto prepend_header;
 			}
 			hdr_uio = NULL;