Commit a9f90ffa authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 1c67ee17
...@@ -281,7 +281,7 @@ func (f *skFile) Read(dest []byte, /*ignored*/off int64) (fuse.ReadResult, fuse. ...@@ -281,7 +281,7 @@ func (f *skFile) Read(dest []byte, /*ignored*/off int64) (fuse.ReadResult, fuse.
if err != nil { if err != nil {
return nil, err2LogStatus(err) return nil, err2LogStatus(err)
} }
return fuse.ReadResultData(dest), fuse.OK return fuse.ReadResultData(dest[:n]), fuse.OK
} }
......
...@@ -551,7 +551,7 @@ func (root *Root) zwatcher(ctx context.Context) (err error) { ...@@ -551,7 +551,7 @@ func (root *Root) zwatcher(ctx context.Context) (err error) {
return ctx.Err() return ctx.Err()
case zevent, ok = <-zwatchq: case zevent, ok = <-zwatchq:
log.Info("event") log.Info("event", zevent, ok)
if !ok { if !ok {
return nil // closed XXX ok? return nil // closed XXX ok?
} }
......
...@@ -185,6 +185,9 @@ def test_wcfs(): ...@@ -185,6 +185,9 @@ def test_wcfs():
def wcsync(): def wcsync():
while len(Z.wctidv) < len(Z.tidv): while len(Z.wctidv) < len(Z.tidv):
l = wc_zhead.readline() l = wc_zhead.readline()
print '\n\n\n'
print '> zhead read: %r' % l
print
l = l.rstrip('\n') l = l.rstrip('\n')
wctid = fromhex(l) wctid = fromhex(l)
i = len(Z.wctidv) i = len(Z.wctidv)
......
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