Index: sys/kern/kern_sendfile.c
===================================================================
--- sys/kern/kern_sendfile.c	(revision 315926)
+++ sys/kern/kern_sendfile.c	(working copy)
@@ -296,8 +296,9 @@ sendfile_iodone(void *arg, vm_page_t *pg, int coun
 		CURVNET_RESTORE();
 	}
 
-	/* XXXGL: curthread */
-	fdrop(sfio->sock_fp, curthread);
+	ACCEPT_LOCK();
+	SOCK_LOCK(so);
+	sorele(so);
 	free(sfio, M_TEMP);
 }
 
@@ -860,7 +861,9 @@ prepend_header:
 		} else {
 			sfio->sock_fp = sock_fp;
 			sfio->npages = npages;
-			fhold(sock_fp);
+			SOCK_LOCK(so);
+			soref(so);
+			SOCK_UNLOCK(so);
 			error = (*so->so_proto->pr_usrreqs->pru_send)
 			    (so, PRUS_NOTREADY, m, NULL, NULL, td);
 			sendfile_iodone(sfio, NULL, 0, 0);