From 9eb5e0793f4abb51814df2667aa50e0b6125b12f Mon Sep 17 00:00:00 2001
From: Aaron Jacobs <jacobsa@google.com>
Date: Mon, 19 Dec 2016 12:53:32 +1100
Subject: [PATCH] buffer: define OutMessage's contents.

---
 internal/buffer/out_message.go | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/internal/buffer/out_message.go b/internal/buffer/out_message.go
index 48721c2..f867015 100644
--- a/internal/buffer/out_message.go
+++ b/internal/buffer/out_message.go
@@ -33,12 +33,18 @@ const OutMessageHeaderSize = unsafe.Sizeof(fusekernel.OutHeader{})
 //
 // Must be initialized with Reset.
 type OutMessage struct {
+	// The offset into payload to which we're currently writing.
+	payloadOffset int
+
+	header  [OutMessageHeaderSize]byte
+	payload [MaxReadSize]byte
 }
 
-// Make sure alignment works out correctly, at least for the header.
+// Make sure that the header field is aligned correctly for
+// fusekernel.OutHeader type punning.
 func init() {
 	a := unsafe.Alignof(OutMessage{})
-	o := unsafe.Offsetof(OutMessage{}.storage)
+	o := unsafe.Offsetof(OutMessage{}.header)
 	e := unsafe.Alignof(fusekernel.OutHeader{})
 
 	if a%e != 0 || o%e != 0 {
@@ -46,6 +52,18 @@ func init() {
 	}
 }
 
+// Make sure that the header and payload are contiguous.
+func init() {
+	a := unsafe.Offsetof(OutMessage{}.header) + OutMessageHeaderSize
+	b := unsafe.Offsetof(OutMessage{}.payload)
+
+	if a != b {
+		log.Panicf(
+			"header ends at offset %d, but payload starts at offset %d",
+			a, b)
+	}
+}
+
 // Reset resets m so that it's ready to be used again. Afterward, the contents
 // are solely a zeroed fusekernel.OutHeader struct.
 func (m *OutMessage) Reset()