Merge pull request droyo#30 from seh-msft/rwalk_fix

Fix Rwalk() setting QIDs erroneously

Author: droyo

conn.go

@@ -161,6 +161,10 @@ func (c *conn) qid(name string, qtype uint8) styxproto.Qid {
 	return c.qidpool.Put(name, qtype)
 }
 
+func (c *conn) getQid(name string, qtype uint8) (styxproto.Qid, bool) {
+	return c.qidpool.Get(name)
+}
+
 // All request contexts must have their cancel functions
 // called, to free up resources in the context. Returns false
 // if the tag is already cancelled

go.mod

@@ -0,0 +1,5 @@
+module aqwari.net/net/styx
+
+go 1.16
+
+require aqwari.net/retry v0.0.0-20180428204214-1281ce5d8df0

go.sum

@@ -0,0 +1,2 @@
+aqwari.net/retry v0.0.0-20180428204214-1281ce5d8df0 h1:BeD6U5TNwhMWxeydyi5xqpaNZx1MWl5QTcW4w7Mxf+Y=
+aqwari.net/retry v0.0.0-20180428204214-1281ce5d8df0/go.mod h1:XSNyyoM+OSg3vRmROPrS1lEpV7q/I9J1HAKMMxdUkU4=

internal/qidpool/pool.go

@@ -42,6 +42,7 @@ func (p *Pool) Put(name string, qtype uint8) styxproto.Qid {
 			m[name] = qid
 		}
 	})
+
 	p.m.Put(name, qid)
 	return qid
 }

request.go

@@ -1,11 +1,10 @@
 package styx
 
 import (
+	"context"
 	"os"
 	"path"
 
-	"context"
-
 	"aqwari.net/net/styx/internal/styxfile"
 	"aqwari.net/net/styx/internal/sys"
 	"aqwari.net/net/styx/styxproto"
@@ -266,6 +265,7 @@ func (t Tcreate) Rcreate(rwc interface{}, err error) {
 	}
 
 	if dir, ok := rwc.(Directory); t.Mode.IsDir() && ok {
+
 		f = styxfile.NewDir(dir, path.Join(t.Path(), t.Name), t.session.conn.qidpool)
 	} else {
 		f, err = styxfile.New(rwc)

walk.go

@@ -1,6 +1,7 @@
 package styx
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path"
@@ -180,7 +181,12 @@ func (t Twalk) Rwalk(info os.FileInfo, err error) {
 	var mode os.FileMode
 	if err == nil {
 		mode = info.Mode()
-		qid = t.session.conn.qid(t.Path(), styxfile.QidType(styxfile.Mode9P(mode)))
+		fqid, found := t.session.conn.getQid(t.Path(), styxfile.QidType(styxfile.Mode9P(mode)))
+		if !found {
+			err = errors.New("rwalk did not find file")
+		} else {
+			qid = fqid
+		}
 	}
 	t.walk.filled[t.index] = 1
 	elem := walkElem{qid: qid, index: t.index, err: err}