Commit e4f22131 authored by Ivan Krasin's avatar Ivan Krasin

Get rid of direct using of makeManagerRequest

parent 1e1606d8
...@@ -188,7 +188,7 @@ func openDir(h *InHeader, r io.Reader, c *managerClient) (data [][]byte, err os. ...@@ -188,7 +188,7 @@ func openDir(h *InHeader, r io.Reader, c *managerClient) (data [][]byte, err os.
return return
} }
fmt.Printf("FUSE_OPENDIR: %v\n", in) fmt.Printf("FUSE_OPENDIR: %v\n", in)
resp := c.makeManagerRequest(h.NodeId, 0, openDirOp, "") resp := c.openDir(h.NodeId)
err = resp.err err = resp.err
if err != nil { if err != nil {
data, err = serialize(h, EIO, nil) data, err = serialize(h, EIO, nil)
...@@ -209,7 +209,7 @@ func readDir(h *InHeader, r io.Reader, c *managerClient) (data [][]byte, err os. ...@@ -209,7 +209,7 @@ func readDir(h *InHeader, r io.Reader, c *managerClient) (data [][]byte, err os.
return return
} }
fmt.Printf("FUSE_READDIR: %v\n", in) fmt.Printf("FUSE_READDIR: %v\n", in)
resp := c.makeManagerRequest(h.NodeId, in.Fh, getHandleOp, "") resp := c.getDirReader(h.NodeId, in.Fh)
err = resp.err err = resp.err
if err != nil { if err != nil {
data, _ = serialize(h, EIO, nil) data, _ = serialize(h, EIO, nil)
...@@ -290,7 +290,7 @@ func releaseDir(h *InHeader, r io.Reader, c *managerClient) (data [][]byte, err ...@@ -290,7 +290,7 @@ func releaseDir(h *InHeader, r io.Reader, c *managerClient) (data [][]byte, err
return return
} }
fmt.Printf("FUSE_RELEASEDIR: %v\n", in) fmt.Printf("FUSE_RELEASEDIR: %v\n", in)
resp := c.makeManagerRequest(h.NodeId, in.Fh, closeDirOp, "") resp := c.closeDir(h.NodeId, in.Fh)
err = resp.err err = resp.err
if err != nil { if err != nil {
return return
...@@ -402,6 +402,18 @@ func (c *managerClient) lookup(nodeId uint64, filename string) (resp *managerRes ...@@ -402,6 +402,18 @@ func (c *managerClient) lookup(nodeId uint64, filename string) (resp *managerRes
return c.makeManagerRequest(nodeId, 0, lookupOp, filename) return c.makeManagerRequest(nodeId, 0, lookupOp, filename)
} }
func (c *managerClient) openDir(nodeId uint64) (resp *managerResponse) {
return c.makeManagerRequest(nodeId, 0, openDirOp, "")
}
func (c *managerClient) getDirReader(nodeId, fh uint64) (resp *managerResponse) {
return c.makeManagerRequest(nodeId, fh, getHandleOp, "")
}
func (c *managerClient) closeDir(nodeId, fh uint64) (resp *managerResponse) {
return c.makeManagerRequest(nodeId, fh, closeDirOp, "")
}
func (m *manager) run(requests chan *managerRequest) { func (m *manager) run(requests chan *managerRequest) {
var resp *managerResponse var resp *managerResponse
for req := range requests { for req := range requests {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment