merge

1 files changed, 6 insertions, 2 deletions

diff --git a/sys/src/cmd/exportfs/exportfs.c b/sys/src/cmd/exportfs/exportfs.c
index 628975dd7..c16220dee 100644
--- a/sys/src/cmd/exportfs/exportfs.c
+++ b/sys/src/cmd/exportfs/exportfs.c
@@ -460,8 +460,8 @@ reply(Fcall *r, Fcall *t, char *err)
 		fatal(Enomem);
 	n = convS2M(t, data, messagesize);
 	if(write(netfd, data, n)!=n){
-		/* not fatal, might have got a note due to flush */
-		fprint(2, "exportfs: short write in reply: %r\n");
+		syslog(0, "exportfs", "short write: %r");
+		fatal("mount write");
 	}
 	free(data);
 }
@@ -570,6 +570,8 @@ getsbuf(void)
 		unlock(&sbufalloc);
 		w = emallocz(sizeof(*w) + messagesize);
 	}
+	w->pid = 0;
+	w->canint = 0;
 	w->flushtag = NOTAG;
 	return w;
 }
@@ -577,6 +579,8 @@ getsbuf(void)
 void
 putsbuf(Fsrpc *w)
 {
+	w->pid = 0;
+	w->canint = 0;
 	w->flushtag = NOTAG;
 	lock(&sbufalloc);
 	w->next = sbufalloc.free;