6 files changed, 43 insertions, 14 deletions

diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c
index 86b6987..2ac9262 100644
--- a/sys/fs/nfs/nfs_commonkrpc.c
+++ b/sys/fs/nfs/nfs_commonkrpc.c
@@ -797,7 +797,7 @@ tryagain:
 	 * These could cause pointer alignment problems, so copy them to
 	 * well aligned mbufs.
 	 */
-	newnfs_realign(&nd->nd_mrep);
+	newnfs_realign(&nd->nd_mrep, M_WAITOK);
 	nd->nd_md = nd->nd_mrep;
 	nd->nd_dpos = NFSMTOD(nd->nd_md, caddr_t);
 	nd->nd_repstat = 0;
diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c
index 545b995..602cf23 100644
--- a/sys/fs/nfs/nfs_commonport.c
+++ b/sys/fs/nfs/nfs_commonport.c
@@ -132,11 +132,11 @@ static int nfssvc_call(struct thread *, struct nfssvc_args *, struct ucred *);
 /*
  * These architectures don't need re-alignment, so just return.
  */
-void
-newnfs_realign(struct mbuf **pm)
+int
+newnfs_realign(struct mbuf **pm, int how)
 {
 
-	return;
+	return (0);
 }
 #else	/* !__NO_STRICT_ALIGNMENT */
 /*
@@ -155,8 +155,8 @@ newnfs_realign(struct mbuf **pm)
  *	with TCP.  Use vfs.nfs.realign_count and realign_test to check this.
  *
  */
-void
-newnfs_realign(struct mbuf **pm)
+int
+newnfs_realign(struct mbuf **pm, int how)
 {
 	struct mbuf *m, *n;
 	int off, space;
@@ -173,11 +173,11 @@ newnfs_realign(struct mbuf **pm)
 			space = m_length(m, NULL);
 			if (space >= MINCLSIZE) {
 				/* NB: m_copyback handles space > MCLBYTES */
-				n = m_getcl(M_WAITOK, MT_DATA, 0);
+				n = m_getcl(how, MT_DATA, 0);
 			} else
-				n = m_get(M_WAITOK, MT_DATA);
+				n = m_get(how, MT_DATA);
 			if (n == NULL)
-				return;
+				return (ENOMEM);
 			/*
 			 * Align the remainder of the mbuf chain.
 			 */
@@ -195,6 +195,8 @@ newnfs_realign(struct mbuf **pm)
 		}
 		pm = &m->m_next;
 	}
+
+	return (0);
 }
 #endif	/* __NO_STRICT_ALIGNMENT */
 
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index b2d74c7..808d2b2 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -271,7 +271,7 @@ out:
  * cases.
  */
 APPLESTATIC void *
-nfsm_dissct(struct nfsrv_descript *nd, int siz)
+nfsm_dissct(struct nfsrv_descript *nd, int siz, int how)
 {
 	mbuf_t mp2;
 	int siz2, xfer;
@@ -296,7 +296,9 @@ nfsm_dissct(struct nfsrv_descript *nd, int siz)
 	} else if (siz > ncl_mbuf_mhlen) {
 		panic("nfs S too big");
 	} else {
-		NFSMGET(mp2);
+		MGET(mp2, MT_DATA, how);
+		if (mp2 == NULL)
+			return (NULL);
 		mbuf_setnext(mp2, mbuf_next(nd->nd_md));
 		mbuf_setnext(nd->nd_md, mp2);
 		mbuf_setlen(nd->nd_md, mbuf_len(nd->nd_md) - left);
diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h
index a13f880..1edb8a3 100644
--- a/sys/fs/nfs/nfs_var.h
+++ b/sys/fs/nfs/nfs_var.h
@@ -235,7 +235,7 @@ int nfsm_strtom(struct nfsrv_descript *, const char *, int);
 int nfsm_mbufuio(struct nfsrv_descript *, struct uio *, int);
 int nfsm_fhtom(struct nfsrv_descript *, u_int8_t *, int, int);
 int nfsm_advance(struct nfsrv_descript *, int, int);
-void *nfsm_dissct(struct nfsrv_descript *, int);
+void *nfsm_dissct(struct nfsrv_descript *, int, int);
 void newnfs_trimleading(struct nfsrv_descript *);
 void newnfs_trimtrailing(struct nfsrv_descript *, mbuf_t,
     caddr_t);
diff --git a/sys/fs/nfs/nfsm_subs.h b/sys/fs/nfs/nfsm_subs.h
index 6e91b99..ebdfbc7 100644
--- a/sys/fs/nfs/nfsm_subs.h
+++ b/sys/fs/nfs/nfsm_subs.h
@@ -100,7 +100,23 @@ nfsm_dissect(struct nfsrv_descript *nd, int siz)
 		retp = (void *)nd->nd_dpos; 
 		nd->nd_dpos += siz; 
 	} else { 
-		retp = nfsm_dissct(nd, siz); 
+		retp = nfsm_dissct(nd, siz, M_WAITOK); 
+	}
+	return (retp);
+}
+
+static __inline void *
+nfsm_dissect_nonblock(struct nfsrv_descript *nd, int siz)
+{
+	int tt1; 
+	void *retp;
+
+	tt1 = NFSMTOD(nd->nd_md, caddr_t) + nd->nd_md->m_len - nd->nd_dpos; 
+	if (tt1 >= siz) { 
+		retp = (void *)nd->nd_dpos; 
+		nd->nd_dpos += siz; 
+	} else { 
+		retp = nfsm_dissct(nd, siz, M_NOWAIT); 
 	}
 	return (retp);
 }
@@ -113,6 +129,15 @@ nfsm_dissect(struct nfsrv_descript *nd, int siz)
 			goto nfsmout; 					\
 		}							\
 	} while (0)
+
+#define	NFSM_DISSECT_NONBLOCK(a, c, s) 					\
+	do {								\
+		(a) = (c)nfsm_dissect_nonblock(nd, (s));		\
+		if ((a) == NULL) { 					\
+			error = EBADRPC; 				\
+			goto nfsmout; 					\
+		}							\
+	} while (0)
 #endif	/* !APPLE */
 
 #define	NFSM_STRSIZ(s, m)  						\
diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h
index 2cbba2d..f0e20f1 100644
--- a/sys/fs/nfs/nfsport.h
+++ b/sys/fs/nfs/nfsport.h
@@ -806,7 +806,7 @@ MALLOC_DECLARE(M_NEWNFSLAYRECALL);
  */
 int nfscl_loadattrcache(struct vnode **, struct nfsvattr *, void *, void *,
     int, int);
-void newnfs_realign(struct mbuf **);
+int newnfs_realign(struct mbuf **, int);
 
 /*
  * If the port runs on an SMP box that can enforce Atomic ops with low