From cd9909534b0d607c6b94645e80f8490684e3a7a3 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Sat, 30 Aug 2003 18:49:28 +0000
Subject: [PATCH] req->r_td can be NULL, remove KKASSERT() and fix check.

---
 sys/vfs/nfs/nfs_nqlease.c | 3 ++-
 sys/vfs/nfs/nfs_socket.c  | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sys/vfs/nfs/nfs_nqlease.c b/sys/vfs/nfs/nfs_nqlease.c
index ffd7b22e13..29e541babc 100644
--- a/sys/vfs/nfs/nfs_nqlease.c
+++ b/sys/vfs/nfs/nfs_nqlease.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_nqlease.c	8.9 (Berkeley) 5/20/95
  * $FreeBSD: src/sys/nfs/nfs_nqlease.c,v 1.50 2000/02/13 03:32:05 peter Exp $
- * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.9 2003/08/20 09:56:33 rob Exp $
+ * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.10 2003/08/30 18:49:28 dillon Exp $
  */
 
 
@@ -925,6 +925,7 @@ nqnfs_vacated(vp, cred)
 	}
 	myrep.r_flags = 0;
 	myrep.r_nmp = nmp;
+	myrep.r_td = NULL;
 	if (nmp->nm_soflags & PR_CONNREQUIRED)
 		(void) nfs_sndlock(&myrep);
 	(void) nfs_send(nmp->nm_so, nmp->nm_nam, m, &myrep);
diff --git a/sys/vfs/nfs/nfs_socket.c b/sys/vfs/nfs/nfs_socket.c
index a93eb1b70f..d2cefac014 100644
--- a/sys/vfs/nfs/nfs_socket.c
+++ b/sys/vfs/nfs/nfs_socket.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/nfs/nfs_socket.c,v 1.60.2.6 2003/03/26 01:44:46 alfred Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.8 2003/08/20 09:56:33 rob Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.9 2003/08/30 18:49:28 dillon Exp $
  */
 
 /*
@@ -430,6 +430,7 @@ nfs_safedisconnect(nmp)
 
 	bzero(&dummyreq, sizeof(dummyreq));
 	dummyreq.r_nmp = nmp;
+	dummyreq.r_td = NULL;
 	nfs_rcvlock(&dummyreq);
 	nfs_disconnect(nmp);
 	nfs_rcvunlock(&dummyreq);
@@ -1575,8 +1576,8 @@ nfs_sigintr(struct nfsmount *nmp, struct nfsreq *rep, struct thread *td)
 		return (EINTR);
 	if (!(nmp->nm_flag & NFSMNT_INT))
 		return (0);
-	KKASSERT(td);
-	if ((p = td->td_proc) == NULL)
+	/* td might be NULL YYY */
+	if (td == NULL || (p = td->td_proc) == NULL)
 		return (0);
 
 	tmpset = p->p_siglist;
-- 
2.41.0