From: Anthony Martin <ality@pbrane.org>
Date: Tue, 5 Feb 2013 03:47:23 +0000 (-0800)
Subject: syscall: fix marshaling of stat messages on Plan 9
X-Git-Tag: go1.1rc2~1142
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c56bb1d238672f658c4f5f5e1efc0fa88c3b3101;p=gostls13.git

syscall: fix marshaling of stat messages on Plan 9

The order of the Qid fields was reversed. Mea culpa.

R=seed
CC=golang-dev
https://golang.org/cl/7231062
---

diff --git a/src/pkg/syscall/dir_plan9.go b/src/pkg/syscall/dir_plan9.go
index eee8be44a3..b7ab4cd108 100644
--- a/src/pkg/syscall/dir_plan9.go
+++ b/src/pkg/syscall/dir_plan9.go
@@ -68,9 +68,9 @@ func (d *Dir) Marshal(b []byte) (n int, err error) {
 	b = pbit16(b, uint16(n)-2)
 	b = pbit16(b, d.Type)
 	b = pbit32(b, d.Dev)
-	b = pbit64(b, d.Qid.Path)
-	b = pbit32(b, d.Qid.Vers)
 	b = pbit8(b, d.Qid.Type)
+	b = pbit32(b, d.Qid.Vers)
+	b = pbit64(b, d.Qid.Path)
 	b = pbit32(b, d.Mode)
 	b = pbit32(b, d.Atime)
 	b = pbit32(b, d.Mtime)
@@ -101,9 +101,9 @@ func UnmarshalDir(b []byte) (*Dir, error) {
 	var d Dir
 	d.Type, b = gbit16(b)
 	d.Dev, b = gbit32(b)
-	d.Qid.Path, b = gbit64(b)
-	d.Qid.Vers, b = gbit32(b)
 	d.Qid.Type, b = gbit8(b)
+	d.Qid.Vers, b = gbit32(b)
+	d.Qid.Path, b = gbit64(b)
 	d.Mode, b = gbit32(b)
 	d.Atime, b = gbit32(b)
 	d.Mtime, b = gbit32(b)