From 7fd68414382693a2e640fb23d56cbccf44d93851 Mon Sep 17 00:00:00 2001
From: Matt Macy <mmacy@FreeBSD.org>
Date: Sat, 19 May 2018 05:10:51 +0000
Subject: [PATCH] sendfile: annotate unused value and ensure that npages is
 actually initialized

---
 sys/kern/kern_sendfile.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c
index 8f7e496d7e46..ace517882f93 100644
--- a/sys/kern/kern_sendfile.c
+++ b/sys/kern/kern_sendfile.c
@@ -341,7 +341,7 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, off_t off, off_t len,
 	}
 
 	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;