Merge branch 'develop'

Author: airnandez

dir.go

@@ -60,12 +60,13 @@ func (d *Dir) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenRe
 	op := NewOpenOp(req, d.path)
 	defer trace(op)
 	newdir := NewDir(d.parent, d.name, d.fs)
-	if err := newdir.doOpen(d.path, req.Flags); err != nil {
+	size, err := newdir.doOpen(d.path, req.Flags)
+	if err != nil {
 		return nil, err
 	}
 	newdir.SetProcessInfo(req.Header)
 	resp.Handle = newdir.handleID
-	op.FileSize = newdir.size
+	op.FileSize = size
 	op.BlockSize = newdir.blksize
 	return newdir, nil
 }

file.go

@@ -31,11 +31,12 @@ func (f *File) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenR
 	op := NewOpenOp(req, f.path)
 	defer trace(op)
 	newfile := NewFile(f.parent, f.name, f.fs)
-	if err := newfile.doOpen(f.path, req.Flags); err != nil {
+	size, err := newfile.doOpen(f.path, req.Flags)
+	if err != nil {
 		return nil, err
 	}
 	resp.Handle = newfile.handleID
-	op.FileSize = newfile.size
+	op.FileSize = size
 	op.BlockSize = newfile.blksize
 	return newfile, nil
 }
@@ -57,10 +58,11 @@ func (f *File) Flush(ctx context.Context, req *fuse.FlushRequest) error {
 	}
 	op := NewFlushOp(req, f.path)
 	defer trace(op)
-	if err := f.doSync(); err != nil {
+	size, err := f.doSync()
+	if err != nil {
 		return err
 	}
-	op.FileSize = f.size
+	op.FileSize = size
 	op.Flags = fuse.OpenFlags(f.flags)
 	return nil
 }
@@ -69,8 +71,13 @@ func (f *File) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadR
 	if !f.isOpen() {
 		return fuse.ENOTSUP
 	}
-	op := NewReadOp(req, f.path, f.size)
+	op := NewReadOp(req, f.path)
 	defer trace(op)
+	size, err := f.getFileSize()
+	if err != nil {
+		return err
+	}
+	op.FileSize = size
 	n, err := f.file.ReadAt(resp.Data[0:req.Size], req.Offset)
 	resp.Data = resp.Data[0:n]
 	op.BytesRead = n

fsops.go

@@ -77,7 +77,7 @@ func (h *Header) MarshalJSON() ([]byte, error) {
 func (h *Header) MarshalCSV() []string {
 	// Pre-allocate so that operation-specific marshallers don't need
 	// to re-allocate to extend the serialized version of each operation
-	res := make([]string, 0, 16)
+	res := make([]string, 0, 32)
 	return append(
 		res,
 		h.Start.UTC().Format(time.RFC3339Nano),
@@ -284,10 +284,9 @@ type ReadOp struct {
 	BytesRead int
 }
 
-func NewReadOp(req *fuse.ReadRequest, path string, fileSize uint64) *ReadOp {
+func NewReadOp(req *fuse.ReadRequest, path string) *ReadOp {
 	return &ReadOp{
 		Header:    NewHeaderFile(req.Header, path, FsRead),
-		FileSize:  fileSize,
 		Offset:    req.Offset,
 		Size:      req.Size,
 		BytesRead: -1,

handle.go

@@ -34,7 +34,6 @@ type Handle struct {
 	file     *os.File
 	handleID fuse.HandleID
 	flags    fuse.OpenFlags
-	size     uint64
 	blksize  uint32
 }
 
@@ -50,21 +49,22 @@ func (h *Handle) isOpen() bool {
 	return h.file != nil
 }
 
-func (h *Handle) doOpen(path string, flags fuse.OpenFlags) error {
+func (h *Handle) doOpen(path string, flags fuse.OpenFlags) (uint64, error) {
 	if h.isOpen() {
-		return nil
+		return 0, nil
 	}
 	mode := int(flags & fuse.OpenAccessModeMask)
 	perm := os.FileMode(flags).Perm()
 	file, err := os.OpenFile(path, mode, perm)
 	if err != nil {
-		return osErrorToFuseError(err)
+		return 0, osErrorToFuseError(err)
 	}
-	if h.size, h.blksize, err = getSizeAndBlkSize(file); err != nil {
-		return err
+	blksize, err := getBlkSize(file)
+	if err != nil {
+		return 0, err
 	}
-	h.file, h.flags, h.handleID = file, flags, newHandleID()
-	return nil
+	h.file, h.flags, h.handleID, h.blksize = file, flags, newHandleID(), blksize
+	return h.getFileSize()
 }
 
 func (h *Handle) doCreate(path string, flags fuse.OpenFlags, mode os.FileMode) error {
@@ -75,19 +75,20 @@ func (h *Handle) doCreate(path string, flags fuse.OpenFlags, mode os.FileMode) e
 	if err != nil {
 		return osErrorToFuseError(err)
 	}
-	if _, h.blksize, err = getSizeAndBlkSize(file); err != nil {
+	blksize, err := getBlkSize(file)
+	if err != nil {
 		return err
 	}
-	h.file, h.flags, h.handleID = file, flags, newHandleID()
+	h.file, h.flags, h.handleID, h.blksize = file, flags, newHandleID(), blksize
 	return nil
 }
 
-func getSizeAndBlkSize(f *os.File) (uint64, uint32, error) {
+func (h *Handle) getFileSize() (uint64, error) {
 	var stat syscall.Stat_t
-	if err := syscall.Fstat(int(f.Fd()), &stat); err != nil {
-		return 0, 0, osErrorToFuseError(err)
+	if err := syscall.Fstat(int(h.file.Fd()), &stat); err != nil {
+		return 0, osErrorToFuseError(err)
 	}
-	return uint64(stat.Size), uint32(stat.Blksize), nil
+	return uint64(stat.Size), nil
 }
 
 func (h *Handle) doClose() error {
@@ -100,17 +101,20 @@ func (h *Handle) doClose() error {
 	return nil
 }
 
-func (h *Handle) doSync() error {
+func (h *Handle) doSync() (uint64, error) {
 	if !h.isOpen() {
-		return nil
+		return 0, nil
 	}
 	if err := h.file.Sync(); err != nil {
-		return osErrorToFuseError(err)
+		return 0, osErrorToFuseError(err)
 	}
+	return h.getFileSize()
+}
+
+func getBlkSize(f *os.File) (uint32, error) {
 	var stat syscall.Stat_t
-	if err := syscall.Fstat(int(h.file.Fd()), &stat); err != nil {
-		return osErrorToFuseError(err)
+	if err := syscall.Fstat(int(f.Fd()), &stat); err != nil {
+		return 0, osErrorToFuseError(err)
 	}
-	h.size = uint64(stat.Size)
-	return nil
+	return uint32(stat.Blksize), nil
 }